tree df52a75f31b849ff68089739cce95e9fb1388ed7
parent 2bac0b43041270f97ea96c3fc544b7f636e4ed37
parent 524748a371e183f627e2778dbc260433f40ad648
author Xin Li <delphij@google.com> 1646734773 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734773 +0000

[automerger skipped] Merge Android 12L am: 524748a371 -s ours

am skip reason: Merged-In I41b0f264d344daeb60050231160084c448083f16 with SHA-1 2bac0b4304 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2011692

Change-Id: I47e7d6ea8c43e352dee514688f92736dacd92092