tree c8356f3a990c967db91383e0ce1f71a87e40a54b
parent 5cc9f721ce36d278df4b0f3fe0a685ba221e9360
parent ef344a3de33eb6979074b8636cc848c64fb5d039
author Leif Wilden <leifhendrik@google.com> 1516318057 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516318057 +0000

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