OSDN Git Service

Merge "Update wakelock detector" into oc-dr1-dev
authorLei Yu <jackqdyulei@google.com>
Fri, 16 Jun 2017 20:52:09 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 20:52:09 +0000 (20:52 +0000)
am: e2530c2f62

Change-Id: Ib3e2aef02b5b3484ffbc43648210781d39e89a55


Trivial merge