OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a3685e4
d9c8155
)
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
author
Suprabh Shukla
<suprabh@google.com>
Thu, 2 Feb 2017 23:13:03 +0000
(23:13 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Feb 2017 23:13:03 +0000
(23:13 +0000)
am:
d9c8155943
-s ours
Change-Id: I9dfff7471440739580e7827cdb4484fad6900048
Trivial merge