tree 3ae07ecfd480aef6f012716bc19cf1d40f45b2f2
parent 3874ad4cb01c02f59632bc2ee6f796090bff893d
parent 52b61fb858726f70ced8efcbdc765bca89bb35c1
author Xin Li <delphij@google.com> 1646820151 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646820151 +0000

[automerger skipped] Merge Android 12L am: 421d783b26 -s ours am: 2aa9351a0e -s ours am: 52b61fb858 -s ours

am skip reason: Merged-In Icfc14be2b731e4958e090bb935807ee414076b7f with SHA-1 6a54988343 is already in history

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

Change-Id: I8afd9a1883cdc7a1513a51054cfb7a9d5c75938b