OSDN Git Service

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1...
authorAdrian Roos <roosa@google.com>
Wed, 2 Aug 2017 23:58:25 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:58:25 +0000 (23:58 +0000)
commita85e54511995249c9e143c094f3b27c00c13dd4b
tree17619fb78270fa9d51d6f3f3886e7b840341fa7a
parentb47776240d9c39f4b19234b8413f1dea8684dc70
parentad825bdfd75ca155d89bdf2fabc478a125ab0e84
Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev
am: ad825bdfd7

Change-Id: I38873a197f94af5013cf8fdd8ad014969bae14f8