| commit | 3afc843a657e906e34f269192c995822fe01d30c | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 19:44:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 19:44:08 2023 +0000 |
| tree | 0040108134d92de2f01c084a410543bfe8dd261e | |
| parent | 1e4d3c714429ef10abdc63e94cc3ab7d238dc7d6 [diff] | |
| parent | 12913fd3275ea398b700a6f29e6597fbc0b7968d [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I81874c597e44945d7e722fccc2c3ce4aada2d9dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>