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:
b18f65a
743fcc1
)
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
author
Wale Ogunwale
<ogunwale@google.com>
Thu, 8 Jun 2017 14:33:03 +0000
(14:33 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 8 Jun 2017 14:33:10 +0000
(14:33 +0000)
1
2
services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
Simple merge