| commit | b73ed7113f22b673b743a5efa980d14f7544cb71 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 19:52:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 19:52:41 2023 +0000 |
| tree | 4852623c77d47902343c471ff4ba7dc924ff8a6c | |
| parent | 2828a742bce64a92630c7a007f7ec8be080a890f [diff] | |
| parent | 99a7448b5b2b29f7b591894edeb68cf9f63c2382 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1 am: 4f8e0db44f am: af9de2e62c am: 8efa785f9b -s ours am: be822171e8 -s ours am: 99a7448b5b -s ours am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e672 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005 Change-Id: Ic5beb18ec273d55404e8e75de2df4110778a9842 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>