| commit | 26784dcf764bee3c90dc5ba6918534ba5df609d8 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 23:03:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 23:03:34 2023 +0000 |
| tree | bc5623b5610a8d75e9c69ca7a09ad98f2062499a | |
| parent | 89045f9fcfe177bcfbff3db35471916f60e91d56 [diff] | |
| parent | f5f429385c88789c77cff7a886605ffaa5f29d47 [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: f5f429385c -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 5fba6ecb07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879 Change-Id: Ibc05f26521d18f406aca0e89fb8660c8167bad1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>