tree 85576bbfd06369ed4aeecc21a12581ee1c20aab2
parent b96920d1e3bd3805cd8540d4d5cca9dc6aa0c780
parent 817bd2f8b3e8549160141886a816e86f6ac50ff9
author Xin Li <delphij@google.com> 1696582786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582786 +0000

[automerger skipped] Merge Android 14 am: aa43ca3bbf -s ours am: 817bd2f8b3 -s ours

am skip reason: Merged-In Idfb8953bf8205b78627c9081a9ef6b52d462234b with SHA-1 e1b6a73e39 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2776741

Change-Id: Ic8666c4387ca0052265745e4360b89a267d06c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>