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)
commit069e8ab3cd31be48f722cf7c6ca10ec9f521ce88
tree79a5718cbc60723755a0e8da0a3edd66aae12065
parentc2bd388bb94dd9708bf907fe6ec807f429c404bd
parent11e7781b32c7b0cdbbd33e055068f8b6cbeeb0f9
Merge "Add aggregated partial wakelock time per uid" into oc-dev
am: 11e7781b32

Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0