tree 3dd5787577a25024d9760121b5a0dcac29b40e31
parent 51c66ea459acdfe8d90ed49637271981b46d0e50
parent c6dc1c9a9bcf46acf606e8fd51bda98e8d7c1fe6
author Leif Wilden <leifhendrik@google.com> 1517527392 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517527392 +0000

Merge "Ensure keyguard is considered unlocked on devices that disable it."