| commit | 71d2a8746614460918d0d5e5a6e571c90b3c80fa | [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 | efd4d1bad284b1432f9cf7aea7b319c50e65c797 | |
| parent | c20a7f1a182d7bc387226c0c7e0319becab53c02 [diff] | |
| parent | 2009c2f06c97932f0ba70cb6aed49e3904319f18 [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"