tree 6e4d5d130a2f2e6047a87ed4b5780ce3d64458a7
parent e55bd1cc18b9f52277334d56b0b9f006bc03d3bc
parent b56074854c1f0f72a44bcdd0379f391b75dbd9e1
author Xin Li <delphij@google.com> 1629232356 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629232356 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8f11dea13b -s ours am: 86285c8c6b -s ours am: b56074854c -s ours

am skip reason: Merged-In I36c46b79d83a295e79bb13250e39377cc4ffb62b with SHA-1 e55bd1cc18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/build/+/15571855

Change-Id: I27b9ad4605d152e3a4460d15d48600f1c3ab9de2