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

[automerger skipped] Merge Android U (ab/10368041) am: 98026013b6 -s ours am: b96920d1e3 -s ours am: 6f6f425480 -s ours am: 456583a60e -s ours

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

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

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