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)
am: 21cd29e235

Change-Id: I30034a1df51296ae3aa5bc74af65dca415d13873


Trivial merge