tree 85576bbfd06369ed4aeecc21a12581ee1c20aab2
parent 98026013b6f8c5c771aabc559f9d50accd63216c
parent aa43ca3bbf7c39407b5f67e8956686340a597556
author Xin Li <delphij@google.com> 1696578767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696578767 +0000

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