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

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