OSDN Git Service

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

Change-Id: Ia731476cb31e2a71caf277c29a6ebb34e0ccac90


Trivial merge