| commit | 100f2fd86aba5a14c5e4b8b4146e329e36d3c48b | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:36:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:36:22 2023 +0000 |
| tree | 32509152093be4a1acc7902196ee1bcfd70584c4 | |
| parent | 170a3810d3649d10c20e0cc3c050bf44b7693858 [diff] | |
| parent | 3e6f7a7f044b714e90f3c564ca8cbb46cc376081 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 727968f0d9 -s ours am: f4b8f6ad22 -s ours am: 3e6f7a7f04 -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: I1afe184d7fab3c725eaf616d460ea0c8f3e9ec36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>