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:
61b0f84
c2aed11
)
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
author
Julius D'souza
<jdsouza@google.com>
Wed, 14 Dec 2016 18:15:47 +0000
(18:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Dec 2016 18:15:47 +0000
(18:15 +0000)
am:
c2aed112a7
-s ours
Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14
Trivial merge