OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8025249 a84b445)
am a84b4453: am f0e2988f: am d8b17079: am 6ae4d53b: resolved conflicts for merge...
authorJeff Brown <jeffbrown@google.com>
Fri, 14 Mar 2014 17:50:25 +0000 (10:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 17:50:25 +0000 (10:50 -0700)
* commit 'a84b44530606fdd9ee25c90f954fa1039096df89':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)


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