commit | 795e405d18a2523ab81bcad47e3256ad66aefb24 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 04 15:01:30 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 15:01:30 2011 +0000 |
tree | 52181d3f31169f8b7bab5cf1180761115a74708d | |
parent | c9dff0f8525adf5cd25ce0aff8e64c8947176fb9 [diff] | |
parent | 4cfae85a8b9b6e9683ac4cd9524d3ad429cba6ad [diff] |
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release * commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0': Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0" Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0" Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0" Revert "Merge "Improve the slow query instrumentation." into ics-mr0"