tree c69d7c8cf968855d4661039b88fc3a1fd6807ce0
parent 23ec2c0651fc1ff9e55cd3ccd0b586369353f2f0
parent 84a940c22ebe1d287af0cfabc5893b3c68b37950
author Sooraj Sasindran <sasindran@google.com> 1486706256 +0000
committer android-build-merger <android-build-merger@google.com> 1486706256 +0000

Merge "Expose api to retrieve wakelock information per client" am: 6fc5284306 am: 11cd850e66  -s ours
am: 84a940c22e  -s ours

Change-Id: Ia0cd9f66079e874368bd7e0535ffe5f97b0cd9e9