OSDN Git Service

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1...
authorAdrian Roos <roosa@google.com>
Thu, 3 Aug 2017 00:47:38 +0000 (00:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:47:38 +0000 (00:47 +0000)
commit79564f71f2765ccbb35d859039a66b234ad2a17c
tree45d1738db58ab269dda5c62a756687469508ebdd
parentc1b21d9254f79a4dc79a7aff0bd5978f1c14e625
parent62fe11f8302b91a7e920e7e3d7ab25f91d806877
Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63 am: 21cd29e235" into oc-mr1-dev-plus-aosp
am: 62fe11f830

Change-Id: Ida4e0311b2d41f9dfaccd34a6bb19ec03f74e8ed