tree e94f2f0f46cd6d06fc62643eaf5c64bbb8a7cea7
parent 0bbf1cc26076fcd65b7dedb61707359b3b46fa15
parent f6a254af55a035cbf61db99d24500e5e22ccfe0d
author Xin Li <delphij@google.com> 1656547382 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547382 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 8b591a2253 -s ours am: 8d2e74f8d9 -s ours am: f6a254af55 -s ours

am skip reason: Merged-In I84ad65b397ac38f30f2a4a8ad8ba384fbb50abdb with SHA-1 3c778d5d37 is already in history

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

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