OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3005c4f a62cec7)
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
authorIrfan Sheriff <isheriff@google.com>
Wed, 7 Dec 2011 20:10:58 +0000 (12:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 20:10:58 +0000 (12:10 -0800)
* commit '8c2122cb3e347c607126c49d76fb165125a02295':
  Fix CS wakelock handling


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