tree ba4d0bca3edf10fd1ca18e1b923199a5b61984cc
parent 74acde1bc5b32457651a0f207ecb7c6303b01ef4
parent 0fc0a7edf78dc0d1c655b40b34efa57e1c03a886
author Sooraj Sasindran <sasindran@google.com> 1486695520 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486695524 +0000

Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp