commit | ffcc25ba924f37aea37d799ed55a44a40f2bce33 | [log] [tgz] |
---|---|---|
author | Kevin Chyn <kchyn@google.com> | Wed Jun 12 21:51:42 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 12 21:51:42 2019 +0000 |
tree | 466d9d432488ca2bf78939a3f9c686ffb57d9a1a | |
parent | 628d311d0c2b5ce4daf36c65ff9ca87d6a461d6f [diff] | |
parent | 059980d2156cf0982a6a96286daf3ab2cbe656cd [diff] |
Merge changes from topic "face-bypass-move" into qt-r1-dev * changes: Make bypass controller consistent with rest of face unlock settings Move lockscreen bypass setting to Settings > Security > Face unlock