tree b137fa0b7a4d4c759c3e955996e3ee74102c5902
parent f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb
parent 12311959c6ec6898e3b40d4e8958b29ec0b72da9
author Android (Google) Code Review <android-gerrit@google.com> 1259032217 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1259032217 -0800

Merge change I06fb08c4 into eclair-mr2

* changes:
  Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)