OSDN Git Service

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

Change-Id: Iebcee8a80d79311f5c967b9db47928653822861f