tree cd6ad7e52edc71312c7ff27b3d7b6f07f40c45a5
parent c6fdb5c8f5d981e9b9215eac1fec01ec8fdb9286
parent 67be3b034a9a36a6804f823f96f12c923da99d0f
author Adrian Roos <roosa@google.com> 1500560822 +0000
committer android-build-merger <android-build-merger@google.com> 1500560822 +0000

Keyguard: only show after screen fully turned off am: 4757c8ccf8 am: 7f0c9be1cc
am: 67be3b034a

Change-Id: I2849184727c193b42c6e42a13cbb64973f8bc2f0