tree 8eecd343a3994477d0d849e6297a893d1df6846b
parent 77d3843777ba5955dc5e429f8266dbceb63e791b
parent 4555ddd8f65a91a603ef658bf06a8f317ee80161
author Xin Li <delphij@google.com> 1678835187 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678835187 +0000

[automerger skipped] Merge Android 13 QPR2 am: d5c253f921 -s ours am: 4555ddd8f6 -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: Ic79b138f3794df9506d1f5bc73897279cdb00936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>