commit ae5b983849455ea2ca21fd2b24ddb8be3ef2e5b7
author The Android Open Source Project <initial-contribution@android.com> Wed Nov 02 17:59:05 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 17:59:05 2011 +0000
tree 1d90b398fb949e1e316b658c863f2f87f7814afb
parent 4cb6ff8dd8e9355b59e120fdcb9a7b2a12717112
parent d4460f97332508a096100c54d1ce11d08a84af69

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"