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:
452297c
1a934fe
)
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
author
Suprabh Shukla
<suprabh@google.com>
Fri, 3 Feb 2017 01:48:20 +0000
(
01:48
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Feb 2017 01:48:20 +0000
(
01:48
+0000)
am:
1a934fe836
-s ours
Change-Id: I52e01060bb82c4d92b1c7cb640f91ba44d7b44dc
Trivial merge