tree 096454abf50a73063ca997f864b3d5f3255a5899
parent f0a54b2317b5017b96c650473093ae59ce00d1e3
parent 7651ae5023d7fe735ea1d96c2e044727171f0cbd
author Xin Li <delphij@google.com> 1629229616 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229616 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 27fa29e45b -s ours am: 7651ae5023 -s ours

am skip reason: Merged-In Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91 with SHA-1 f0a54b2317 is already in history

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

Change-Id: Ie074a69ae36f00591be2c8d8fccb3c47b33567fa