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:
9c95a9c
cda0f97
)
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 00:02:16 +0000
(
00:02
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Feb 2017 00:02:16 +0000
(
00:02
+0000)
am:
cda0f97790
-s ours
Change-Id: Icdd1d73aed0798a98d960c931dfb36ed9f350212
Trivial merge