tree a0a62f6920df6a5cb2b02a0ad4681ff7ba1d1900
parent 989af76e856a824c09d16feea424814aaa7a55fd
parent 77d3843777ba5955dc5e429f8266dbceb63e791b
author Xin Li <delphij@google.com> 1673645756 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673645756 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 3b85d5385f -s ours am: 77d3843777 -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: I691cfe88140d019341bcda8a3d20f30363731e24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>