tree b83bbf920bd690471248967ee6c1035399b0fad3
parent 3c12e8f280ecc4f00823a184e5b9fe1d51ca9590
parent eea0add29c95a8703a2bf423b84585d7a2ce6259
author Xin Li <delphij@google.com> 1665519009 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1665519009 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ede31c2417 -s ours am: eea0add29c -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/+/20137106

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