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 17:51:28 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 17:51:28 +0000 (17:51 +0000)
am: 589f83e686  -s ours

Change-Id: I76a619ed9824174735d0a86c55fe13a3d6e90ec5


Trivial merge