| commit | da1ee14f286f121caa811ba5802d860c49bece15 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:33:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:33:03 2023 +0000 |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 | |
| parent | 7dc82049abdfc606fabdd29f5018dafb40682f54 [diff] | |
| parent | 0087df4718da3916f147a3675fec243c10936e7e [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: f7e217a73f -s ours am: d7f94d248e -s ours am: 0087df4718 -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: I69174b5b0795945cac767c6ca6a6c30bb24c259d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>