tree 207ed077251f4d3375728aa281811a2ff2e24b42
parent 5d28e004e26cfac3ef07e30e33608305e14ce3dc
parent 90aebb320b00c8761e0f17cae52746406fb56e4f
author Xin Li <delphij@google.com> 1670846235 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670846235 +0000

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