OSDN Git Service

Merge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8
authorAdam Bookatz <bookatz@google.com>
Fri, 19 May 2017 18:41:45 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 18:41:45 +0000 (18:41 +0000)
am: 95cf947fba

Change-Id: I58660c0671a49388f8b9fdff28060e9312fa497d


Trivial merge