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"
This commit is contained in:
The Android Open Source Project 2011-11-04 15:01:30 +00:00 committed by Android Git Automerger
commit 71d2a87466

Diff Content Not Available