commit | 1cfa63114a9014ee701915ce97680993177da46e | [log] [tgz] |
---|---|---|
author | Aaron Liu <aaronjli@google.com> | Thu Aug 24 20:03:39 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 24 20:03:39 2023 +0000 |
tree | 1eabb042a116e996e19a6bc4997c79452611ca25 | |
parent | 4da1d273236dc3f78ca964e6fe94df89e9d6fcb8 [diff] | |
parent | 740b82fbd4035a065df1c04cbb46f33b88c1127c [diff] |
[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours am: 740b82fbd4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413226 Change-Id: I7bc5c6af6ec16a8c210cc43e881a1bc3ec86cf01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>