OSDN Git Service

Merge "Add aggregated partial wakelock time per uid" into oc-dev
authorAdam Bookatz <bookatz@google.com>
Fri, 19 May 2017 18:32:31 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 18:32:31 +0000 (18:32 +0000)
am: 11e7781b32

Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0


Trivial merge