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)
commit69050d2bda802736bee489010d26e9130ae8f75f
tree2973faf34b4b98ac99e16adfe24e31c4c367ff70
parent1bed022001edcb0db0b11c19bb71d215ef295d30
parent25371b152c008f0d743ecc38e9d544c86007bf7d
Merge "Update wakelock detector" into oc-dr1-dev am: e2530c2f62
am: 25371b152c

Change-Id: I980c6b356862e9d8af46e36e08f3d2cc07d5cf65