tree fa0429fae76936b9bc212aa5ddd323759bc005fc
parent 481321b6506f3de90288d295592d5893d263f3c5
parent ba05aa630001336fb0bfe4a5f5b596697069087d
author Xin Li <delphij@google.com> 1633679911 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679911 +0000

[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 -s ours am: ba05aa6300 -s ours

am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439

Change-Id: I51b50fad68d07273d406e83c178c4e6e340e54e4