| commit | 5ad122f1570a8f643f6534d8e510f63a9609e75d | [log] [tgz] |
|---|---|---|
| author | Aaron Liu <aaronjli@google.com> | Mon Aug 21 18:12:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 21 18:12:50 2023 +0000 |
| tree | 162911f90bce2dd12bd7438f4c94639e1ad685ac | |
| parent | e546471902adf7344a359ea0c70ef4b7f1dba44c [diff] | |
| parent | ff1fd3bdcba36920b3824bce40792a4972d23785 [diff] |
[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into udc-dev am: 12ba8d5011 am: e86bb3b32d -s ours am: ff1fd3bdcb -s ours am skip reason: Merged-In I8e33db8eb6e2c917966cab3d6a4f982670473040 with SHA-1 deba34ccbf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413225 Change-Id: I068dcdcb99953bd4ba24bb0154c1398900d7cc53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>