| commit | 46a074f9721dde8831f9a381863d35235316a56b | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 21:10:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 21:10:00 2023 +0000 |
| tree | a34dc7f6b26864bccfe812c6c0d7be23bc0eba43 | |
| parent | 399ba04c2cb16064205a9547956c1591c3588ec4 [diff] | |
| parent | 5287ed487ac6d5491dd4b863b1772cc626a047fc [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: fe385872d4 -s ours am: 5cf809251b -s ours am: 5287ed487a -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: I569143aa2d72d494033bb3ac249c12a94c40cee2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>