OSDN Git Service

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

Change-Id: I980c6b356862e9d8af46e36e08f3d2cc07d5cf65


Trivial merge