tree 8eecd343a3994477d0d849e6297a893d1df6846b
parent 6c0ede81ed475811fd61b0db8d902a436c0afd24
parent bdc8e3f473866f687b49c1d1341e93ca49fafb06
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670637636 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670637636 +0000

Merge "[automerger skipped] Merge Android 13 QPR1 am: e3ba45fd2f -s ours" into stage-aosp-master am: bdc8e3f473 -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: I15eeb19366d393a86e409e6ad5edcf002f93da1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>