OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e67bdda 4e5c089)
am 4e5c089e: resolved conflicts for merge of 337e764d to master
authorJeff Brown <jeffbrown@google.com>
Fri, 11 Apr 2014 08:43:44 +0000 (08:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Apr 2014 08:43:44 +0000 (08:43 +0000)
* commit '4e5c089ef3e62e7f658e71c0be262d09bd3e399b':
  Plumb display power state through display manager.

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help