tree 72c38d84cbf1c049d95e9a4ce57c00606a56da1d
parent e4e517613942661240d343fbddf0994c0f5e2678
parent 6f6f425480d04fbfb2f3a3be68158506391b38cf
author Xin Li <delphij@google.com> 1693271495 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693271495 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 98026013b6 -s ours am: b96920d1e3 -s ours am: 6f6f425480 -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: Ic31b939c5126385f736d93b3ffb3d220b0d0629d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>