| commit | 2435060158386966d45a35834bfd20f45d7b1760 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Oct 03 23:34:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 03 23:34:29 2023 +0000 |
| tree | feb88210b8a5251e2e1e0db9c89abaaa141b1de8 | |
| parent | 73214b7983d6b53ac65138623dd90055da1db628 [diff] | |
| parent | 9e9cdd8efe6e0bf7ea6a654b61fa839e8cbca45c [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 581a3fe494 -s ours am: 9e9cdd8efe -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: I0bc75b0eed841f58a0a2db66d7cae4647b5be084 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>