| commit | d5ae6e41b6277afb99c08d129bcc2417515f1a1a | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 00:31:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 00:31:46 2023 +0000 |
| tree | 20e46bbcc80d62d575cb84db84bd7fc9dc0852cf | |
| parent | c11374bc09286c266733d9e8734b5abd6b4cc18b [diff] | |
| parent | 34539a4dcdea42a15af7a9f1ad0cb7292da729e3 [diff] |
Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours am: fa1bc4a7ef -s ours am: 81c628fcbd -s ours" into udc-d1-dev-plus-aosp am: 34539a4dcd -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 35a6e2f2c9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I8fd642df14e82d77ed518e85d6991f1da2711b53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>