| commit | ce565c04cb87909a1ec40f81443442730f949366 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 22:12:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 22:12:46 2023 +0000 |
| tree | 1daec0e4fda68fdc61444aff8195393026a127f9 | |
| parent | 9412b7d16a0cd2a64d05ffdb2ac472e38db7e9ba [diff] | |
| parent | bd062455ecd3cc0c4e88997d85251a842e21df90 [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: b73ed7113f -s ours am: 1b77ed7e53 -s ours am: 399ba04c2c -s ours am: abb44d2ed5 -s ours am: bd062455ec -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: I8f4a0b74ee037fd6c398449ef321b40290fd312a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>