tree 85576bbfd06369ed4aeecc21a12581ee1c20aab2
parent 6f6f425480d04fbfb2f3a3be68158506391b38cf
parent f842bf268f6fa0aabca542999058030b93daaa45
author Xin Li <delphij@google.com> 1696585887 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585887 +0000

[automerger skipped] Merge Android 14 am: aa43ca3bbf -s ours am: 817bd2f8b3 -s ours am: f842bf268f -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: I7b20ea44e78644e6fdfbc2b130f6bf0cfdb14995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>