OSDN Git Service

DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
authorJulius D'souza <jdsouza@google.com>
Wed, 14 Dec 2016 18:15:47 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 18:15:47 +0000 (18:15 +0000)
am: c2aed112a7  -s ours

Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14


Trivial merge