| commit | 9e9cdd8efe6e0bf7ea6a654b61fa839e8cbca45c | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 23:04:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 23:04:16 2023 +0000 |
| tree | 700bdc984b494d340dc6317e0de7703d486634fc | |
| parent | 83caa0c5a3b9cbd5f7acf57291be2bf1454e41c9 [diff] | |
| parent | 581a3fe494325b9f7b15ec9e7f0d901742bafa54 [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 581a3fe494 -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: I215e9e6ff6cdd9dcd425f6506c6aebb47dc1e780 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>