tree 72c38d84cbf1c049d95e9a4ce57c00606a56da1d
parent 456583a60e659ec7209b8a0990ccee811de51a1f
parent 1afbb6e3fe1179aaad4e09ff37f2928cf8bfa11a
author Xin Li <delphij@google.com> 1696590078 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696590078 +0000

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