tree 7fe4252f79389edc4b9a8f29171bdeb1bf90ec41
parent f535f8108d786312efccce94b009fd6cfecbbd7f
parent a6e5165b2c45526e02299fd24c398f763e7f17c9
author Jorim Jaggi <jjaggi@google.com> 1519409293 +0000
committer android-build-merger <android-build-merger@google.com> 1519409293 +0000

Merge "Don't wait keyguard drawn if device has no keyguard"
am: a6e5165b2c

Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52