commit | a870bc848f9413f96f3e5748ff66bcd0017a6e40 | [log] [tgz] |
---|---|---|
author | Aaron Liu <aaronjli@google.com> | Thu Aug 24 19:59:33 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 24 19:59:33 2023 +0000 |
tree | 7567a4b16ca63ea07016fcf2245b70359dff5dad | |
parent | d7bdf0120e5b74e762e4ce7d56ccffeb1be91eff [diff] | |
parent | 0f2ef46b2cb747ae9da84eb06475e5e2dc2679e3 [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: baaedb5d8a -s ours am: 0f2ef46b2c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413226 Change-Id: If2043520aea57a6fbb137ba185febe1a151a1d8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>