| commit | 4e21c38fee203e2c63149d10a99145f2210282c8 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 23:34:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 23:34:30 2023 +0000 |
| tree | feb88210b8a5251e2e1e0db9c89abaaa141b1de8 | |
| parent | 73214b7983d6b53ac65138623dd90055da1db628 [diff] | |
| parent | d59d2a5842333d0114fa7a05afdfda8d792c4ee9 [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 82d877664b -s ours am: d59d2a5842 -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: Ia2c482e7c301321b0a72d7582cf324eb7cddf344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>