tree 207ed077251f4d3375728aa281811a2ff2e24b42
parent 0984d4b4d8d7737594fdb2c01a9c24788ab1fb6b
parent 6c0ede81ed475811fd61b0db8d902a436c0afd24
author Xin Li <delphij@google.com> 1670852888 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670852888 +0000

[automerger skipped] Merge Android 13 QPR1 am: e3ba45fd2f -s ours am: bc9ae64ebb -s ours am: 6c0ede81ed -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: I46721c65f22cf68a45acb8471cb12ecef0e44df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>