| commit | 246b5cd2bf28c871385458d36e234fb088edb838 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:30:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:30:08 2023 +0000 |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 | |
| parent | 472ed62fbed09884c7313936005ea505d4eb99fe [diff] | |
| parent | f2a8f5787a4b392341f792e4ed428161c2b5d4e3 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 3afc843a65 -s ours am: e7ec6b0aa0 -s ours am: 4e0df66dea -s ours am: 3c56801327 -s ours am: f2a8f5787a -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: I426ba546ad967848acdfc11a414d3b122cd59aa4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>