tree 8eecd343a3994477d0d849e6297a893d1df6846b
parent 90aebb320b00c8761e0f17cae52746406fb56e4f
parent bc9ae64ebbdeb00ea3484dbb2abfb7ebf44c806a
author Xin Li <delphij@google.com> 1670637461 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670637461 +0000

[automerger skipped] Merge Android 13 QPR1 am: e3ba45fd2f -s ours am: bc9ae64ebb -s ours

am skip reason: Merged-In I62825661a5b260c3612420536e4d830341886a9c with SHA-1 2bc2bf601f is already in history

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

Change-Id: Id22fdf3327e8d73afcc5058ba73191ac468eb941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>