OSDN Git Service

Merge "DozePlugin: Remove" into oc-dev am: b2484f2258
authorAdrian Roos <roosa@google.com>
Wed, 3 May 2017 13:55:11 +0000 (13:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 13:55:11 +0000 (13:55 +0000)
commit673c07f3da0a7e5f21bd50549c1a3ccbea7deff0
treebdc518c5cff2d5450269414d6c07526b7ad5017c
parent60e305ce8ca1e111f382c3b221fd92536e8283b5
parent825b5748925f30d936b691f335ae3d8133483f31
Merge "DozePlugin: Remove" into oc-dev am: b2484f2258
am: 825b574892

Change-Id: I5994fbdd9cc15c1dc42fbecd63792eb2214ab017
packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java