OSDN Git Service

Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am...
authorAdrian Roos <roosa@google.com>
Wed, 2 Aug 2017 23:19:34 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:19:34 +0000 (23:19 +0000)
commitbfecb3008f79fa5e98cc4bd1d1b43426d522e70d
tree9e21ead04d8989d1dcd932ab52f094760f2db16c
parentf749719e53be6cbe71a1a72a531792f855d841da
parent21cd29e235bfa3736dfb4fb4c02d9a9105dc5be4
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63
am: 21cd29e235

Change-Id: I30034a1df51296ae3aa5bc74af65dca415d13873