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:
cbbf530
730c2d9
)
Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0
author
Sooraj Sasindran
<sasindran@google.com>
Fri, 10 Feb 2017 05:50:12 +0000
(
05:50
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 Feb 2017 05:50:12 +0000
(
05:50
+0000)
am:
730c2d9c72
-s ours
Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c
Trivial merge