OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f47368b fc1a3ac)
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 14:59:40 +0000 (14:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Nov 2011 14:59:40 +0000 (14:59 +0000)
commitf8bbc7a0ffe9b93f8c496979904d18e595027010
treef52a8c4d2249de589004b292f80ef9ec1f10a849tree | snapshot
parentf47368b74d8d300bcd08cf148b609164245186a9commit | diff
parentfc1a3ac1641b8849bf925a6bf0fa96b2abcdd91fcommit | diff
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"
frameworks/av
About OSDN
Find Software
Develop Software
Help