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:
27d9ca0
46f2cde
)
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
author
Adrian Roos
<roosa@google.com>
Wed, 2 Aug 2017 21:42:47 +0000
(21:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 21:42:47 +0000
(21:42 +0000)
am:
46f2cdeb63
Change-Id: Ia731476cb31e2a71caf277c29a6ebb34e0ccac90
Trivial merge