3b25c4d8453b47e13e3af002f74b4806422f9ee3 - platform/frameworks/base

commit	3b25c4d8453b47e13e3af002f74b4806422f9ee3	[log] [tgz]
author	The Android Automerger <android-build@android.com>	Mon Oct 31 16:47:11 2011 -0700
committer	The Android Automerger <android-build@android.com>	Mon Oct 31 16:47:11 2011 -0700
tree	6c1a8e3200f0126079d58a057cd62e44038fa909
parent	1eca250b9dad45893fead128539f112cbc513496 [diff]

Revert "Merge "Improve the slow query instrumentation." into ics-mr0"

This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.

core/java/android/database/CursorWindow.java[diff]
core/java/android/database/sqlite/SQLiteDatabase.java[diff]
core/java/android/database/sqlite/SQLiteDebug.java[diff]
core/java/android/database/sqlite/SQLiteQuery.java[diff]
core/java/android/os/Build.java[diff]
core/jni/android_database_CursorWindow.cpp[diff]
libs/binder/CursorWindow.cpp[diff]

7 files changed

tree: 6c1a8e3200f0126079d58a057cd62e44038fa909