tree b3aba730e4be5375920db950fca3f408c0992d64
parent 09163f4c8e78023bf7f6877b74e8afea7ec0ef00
parent 7198e66579453990e3d31283f83c739fc555f202
author Xin Li <delphij@google.com> 1678845856 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678845856 +0000

[automerger skipped] Merge Android 13 QPR2 am: d5c253f921 -s ours am: 4555ddd8f6 -s ours am: 72de7f0cbe -s ours am: f23b1dae8e -s ours am: 7198e66579 -s ours

am skip reason: Merged-In Ie7623a4b6fd2101fb6acd5be7584a9e4cbf0e3e4 with SHA-1 d1ac9605f7 is already in history

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

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