commit | 64cd09456d67f25ea742783ed9308867583c38dd | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 03 00:00:16 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 03 00:00:16 2017 +0000 |
tree | 70e80631054132dbae79ebfce39c8f1dfe216a01 | |
parent | 482e35d51a01f2c45d54a593b03cb056a697197e [diff] | |
parent | a85e54511995249c9e143c094f3b27c00c13dd4b [diff] |
Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev am: ad825bdfd7" into oc-mr1-dev-plus-aosp