OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitfd57665ece9b8ee174d6efe4df7e41e07c7c44f1
tree8aeeca534dcb20d1ec8ef860b479007664bdb0b8tree | snapshot
parentcfc24068990c7602fc4a7a630b0871a3fe239509commit | diff
parent254c2211b5088bb7d84d7126306aad7763b58372commit | diff
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"
frameworks/av
About OSDN
Find Software
Develop Software
Help