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:
bca7343
9665145
)
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
author
Suprabh Shukla
<suprabh@google.com>
Thu, 2 Feb 2017 23:36:21 +0000
(23:36 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Feb 2017 23:36:21 +0000
(23:36 +0000)
am:
9665145f5b
-s ours
Change-Id: I1fe1db3803622ddb831c9e2a42f17f4a1d698a51
Trivial merge