tree a1c43e58496a0aa63d850dd03f88e8e5e35296cd
parent e7d464429324d444091a9fc084152b21da857d1e
parent c88d6224db0d4d678198763c5b355cc8d642cbc8
author Dave Mankoff <mankoff@google.com> 1541616831 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541616831 +0000

Merge "Create a way to turn off unlocking on a phone."