tree 20bc0e4de2b79755aee790fbdbbb120688707ffa
parent 707d2f6851e7124f76a84e0b8c143ad73f867128
parent dce529a11a84827b938b4ec18333e9ebaff2f2c6
author Aaron Liu <aaronjli@google.com> 1692651602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692651602 +0000

[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into rvc-dev am: ef02392991 am: 97ed96529a -s ours am: bc476c7458 -s ours am: b4e7146d59 -s ours am: 15176a4fa8 -s ours am: d7e378f1cf -s ours am: 95f9c4fb95 -s ours am: dce529a11a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413973

Change-Id: I85ede0ec83319e5ebb859a5172390b5458c3def8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>