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:
710a7e4
e3d5ea3
)
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
author
Suprabh Shukla
<suprabh@google.com>
Thu, 2 Feb 2017 23:49:45 +0000
(23:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Feb 2017 23:49:45 +0000
(23:49 +0000)
am:
e3d5ea3a18
-s ours
Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf
Trivial merge