tree 82ccb098d8796d6780bbfa65e8c6066ecf2dc007
parent 94481bd75541b227eb4325a3db5ee871cdc2b2dc
parent b59573cf53c8f09ac25fe0bfaf1d7067604ee983
author Dan Egnor <egnor@google.com> 1259032463 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259032463 -0800

am b59573cf: Merge change I06fb08c4 into eclair-mr2

Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp

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