tree 8eecd343a3994477d0d849e6297a893d1df6846b
parent fdfd353d60d2c7bb86d8b5f9872af669e9014f14
parent 84e3bcb78f477fd2429901c12bb5f83e6c62209d
author Xin Li <delphij@google.com> 1670631902 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670631902 +0000

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