| commit | be822171e8a0203f8c5fb8e58b979dfa2a160577 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 18:47:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 18:47:26 2023 +0000 |
| tree | b0cf551255e6b77d244dfb64aa8200c9f87b67db | |
| parent | 4a0b42a72cc306f4963aa5326b3366191db6b01a [diff] | |
| parent | 8efa785f9bc51ab78c767f599075f9e354968339 [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 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: Ic99da6eb6de91c04d81f300ffc1db4b9a688f5e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>