tree 207ed077251f4d3375728aa281811a2ff2e24b42
parent 3fd1ad44523432c1502761de68d23298a99c6050
parent 9c90fd1ed5ce9f78986614c1574d7a6546e777a0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670853060 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670853060 +0000

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