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:
8e0ca28
d983ba5
)
Merge "Add PowerManager method to assign blame to a single uid" into klp-dev
author
Marco Nelissen
<marcone@google.com>
Thu, 3 Oct 2013 16:34:57 +0000
(16:34 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 3 Oct 2013 16:34:57 +0000
(16:34 +0000)
1
2
services/java/com/android/server/power/PowerManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/power/PowerManagerService.java
Simple merge