commit | af4d44db1071bc94c1724248cef5716b46939d89 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:08:40 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:08:40 2023 +0000 |
tree | 3d5b2c1c976dda1dc6086df5b93c67120709aa06 | |
parent | 0fd1f0c3d4f4dc07ba560f6dedd6549a7a3fbcda [diff] | |
parent | 61ecdb33a91ea5d81148f1151e810499a1f9f766 [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: 1efe53e8a6 -s ours am: 61ecdb33a9 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: Ibf115ec2773ca4d88ac8b24d011e0ce445576a93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>