| commit | d59d2a5842333d0114fa7a05afdfda8d792c4ee9 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 23:03:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 23:03:32 2023 +0000 |
| tree | 37f19edbaafcce153978c2e37e2013c955f304e9 | |
| parent | 58db872749b4c58f381aaccff2d6a4f0ba9a67c0 [diff] | |
| parent | 82d877664bc4cac9e7312e72aeab8fcb8daed20f [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 82d877664b -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 d9c7c85c52 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879 Change-Id: If4c16aa17f907e4fdeeec57e8c441f317e7632cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>