tree df52a75f31b849ff68089739cce95e9fb1388ed7
parent d7767b6d5f79fedef7367dcfa073bf2b76a82dbf
parent abdf9ae1d1dac4b4a7cc0b99ef6750c3f3378241
author Xin Li <delphij@google.com> 1646737463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737463 +0000

[automerger skipped] Merge Android 12L am: 524748a371 -s ours am: abdf9ae1d1 -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: Iadfb2fab527f652bb9149fab11648e0da57f414d