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:
2f4cdbb
af52a9d
)
Merge \\"Add reporting of long wake locks.\\" into nyc-mr1-dev am: ca37695ebc
author
Dianne Hackborn
<hackbod@google.com>
Wed, 20 Jul 2016 16:00:57 +0000
(16:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 20 Jul 2016 16:00:57 +0000
(16:00 +0000)
am:
af52a9d1bf
Change-Id: I29451b3dc161e29804f42f40aa9e15836979cd4a
1
2
services/core/java/com/android/server/power/PowerManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/power/PowerManagerService.java
Simple merge
OSDN Git Service
