Commits

The Android Automerger authored 50b193c82d0
Revert "Merge "Improve the slow query instrumentation." into ics-mr0" This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.