commit | 4f60913bc98fdca8e830fb036d16f1f818f2e2dd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:39:24 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:39:24 2023 +0000 |
tree | 2727a1c537f41f85d3d4d6bba2dd2125b9506ac1 | |
parent | 556b3af48aa79b66cb8972e130a77bc633bfc691 [diff] | |
parent | af4d44db1071bc94c1724248cef5716b46939d89 [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: af4d44db10 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I0c7c9ffc1eb3f81b7d6e1dae5f06bce3882dc71b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>