tree 82d5f27b69a0ac0e7ca65a75a84e2faf4654049c
parent 50985781f41f12955f0a5780c3137de197d54641
parent e233cecf170f88526ca0e6509c13c9a041c5b265
author Dan Egnor <egnor@google.com> 1259032815 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259032815 -0800

am 82fa9c46: am b59573cf: Merge change I06fb08c4 into eclair-mr2

Merge commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9'

* commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9':
  Expand db_operation logging to prepare for widespread sample collection: