| commit | f8bbc7a0ffe9b93f8c496979904d18e595027010 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 04 14:59:40 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 04 14:59:40 2011 +0000 |
| tree | f52a8c4d2249de589004b292f80ef9ec1f10a849 | |
| parent | f47368b74d8d300bcd08cf148b609164245186a9 [diff] | |
| parent | fc1a3ac1641b8849bf925a6bf0fa96b2abcdd91f [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"