commit | 8f78b0ac4029e61b9c4978b332e5271ad1a6722d | [log] [tgz] |
---|---|---|
author | Aaron Liu <aaronjli@google.com> | Thu Aug 24 21:32:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 24 21:32:31 2023 +0000 |
tree | dd8e0acd7acd3bcca8d689562f064329c6aa9e67 | |
parent | ddc7bbfd5b5c1f3bf6a0e2bcbf1f70af72cd66ac [diff] | |
parent | 3ee067c0386a11578d7d21e5fc58b45ba107e84b [diff] |
[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours am: a71c9ea8f3 -s ours am: 3ee067c038 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413934 Change-Id: If4d38b545be08a5d1fbef86879bede502174796b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>