OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfc2406 254c221)
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Nov 2011 17:56:48 +0000 (17:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Nov 2011 17:56:48 +0000 (17:56 +0000)
* 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"


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help