tree 707cfab162adea69ff90d2354b4244efc27585c4
parent e726fc95ae63d446864b951a5f53736e0110e89c
parent 2f5adc3e76cbe5c14d334e69c440b14025663f75
author Xin Li <delphij@google.com> 1629232381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629232381 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 27fa29e45b -s ours am: 7651ae5023 -s ours am: 2f5adc3e76 -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: Ifd0ca5da62dd21cbdbd6d167b8fce717451969c5