tree 8c986e32937c71d62844fdcc8157acc6c3377538
parent ed97446c2115c6b8f0ac9b188fa16d0ac5298023
parent 8e88739365ddab2a7ed4a325e9766307140c593e
author Xin Li <delphij@google.com> 1629232347 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629232347 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d50b4c7322 -s ours am: 3c8be6ebe6 -s ours am: 8e88739365 -s ours

am skip reason: Merged-In Ia42139b9b5de2ef8f2832c5378cf03bd07164ef8 with SHA-1 ed97446c21 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/adt-infra/+/15571775

Change-Id: I9010d944d12a84d6395048043fd9574c838d7351