| commit | 7b95eba9f47a3992128d59a9ec593b887e4dac0e | [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 | 8df0a12493d135a53088aa6cb6f1033be31b456f | |
| parent | c430b70b5a66c2b22e5c663ac1574cc72a6e6fc8 [diff] | |
| parent | 8242cc49a90aa13a4830a735438b6e3cf73ea0f0 [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"