tree c4681eeb192bf94759d9790ec34c685c6218634f
parent 3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf
parent 9eb4c891a3db118f2546af7593c6251f3210f3ef
author The Android Open Source Project <initial-contribution@android.com> 1320167439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320167439 +0000

am 9eb4c891: Reconcile with ics-factoryrom-2-release

* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"