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:
46c8c8d
5e1f15a
)
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am...
author
Wale Ogunwale
<ogunwale@google.com>
Thu, 8 Jun 2017 14:53:01 +0000
(14:53 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 8 Jun 2017 14:53:01 +0000
(14:53 +0000)
am:
5e1f15a89d
Change-Id: Ifb7664c7ade59390d682d0bebb6055097e653342
Trivial merge