commit | 75564c4cfdfe8b307a37e236226e0115aae347f5 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:08:19 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:08:19 2023 +0000 |
tree | 0f2387bae50c81079bd2e3acaee7b9d14c190793 | |
parent | fd49d80b7355b0763f48f375c5259ae1f0681f54 [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: If235b4711b5eb3c9cf9352e542f64678dd40f819 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>