tree 8eecd343a3994477d0d849e6297a893d1df6846b
parent 9c90fd1ed5ce9f78986614c1574d7a6546e777a0
parent 3b85d5385f3074c28b77db18ed5614aa4e5927a5
author Xin Li <delphij@google.com> 1673597318 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673597318 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 3b85d5385f -s ours

am skip reason: Merged-In Ie7623a4b6fd2101fb6acd5be7584a9e4cbf0e3e4 with SHA-1 d1ac9605f7 is already in history

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

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