| commit | a689c1bbffc5469c524c3fe741ffa86a4d191eb2 | [log] [tgz] |
|---|---|---|
| author | Peter Kalauskas <peskal@google.com> | Tue Feb 09 23:42:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 09 23:42:47 2021 +0000 |
| tree | 56751ce4406d5232c2807b029675787aeee589e2 | |
| parent | 6af9486183cb6a089622f73205cd0455db981d5d [diff] | |
| parent | 2b9f139a2d9884eeec64e8c916b62cc2166896f3 [diff] |
Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev am: 2b9f139a2d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13502922 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie8bdd8673766b0dcf2d7bd0750d3d7845ffafc76