OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c20a7f1 2009c2f)
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 15:01:30 +0000 (15:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Nov 2011 15:01:30 +0000 (15:01 +0000)
* 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"


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