commit | 81c628fcbd646dd58f86aa36f0b22beafddf18f6 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:09:07 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:09:07 2023 +0000 |
tree | 0f2387bae50c81079bd2e3acaee7b9d14c190793 | |
parent | 68f052cc9f9d2cfded599d9b8f8f5fa8a351bffa [diff] | |
parent | fa1bc4a7efd5d6bb82d215160cefa73918cae54b [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours am: fa1bc4a7ef -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I2206c7e899748dc5802e50f2ef7e3f4f87343de6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>