OSDN Git Service

Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0
authorSooraj Sasindran <sasindran@google.com>
Fri, 10 Feb 2017 05:50:12 +0000 (05:50 +0000)
committerandroid-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