Commits
The Android Open Source Project authored and Android Git Automerger committed c89d527996fM
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release * commit '11b49ba933bab7ff8262139141eef0e5f3c45a18': 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" Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Showing diff to8d317b5be89