tree ffc6a28172543355dc420d80c16111f2447d2903
parent d6eef7256e81340acacbf487e7478c513a606d63
parent 45efd40ef2e123defe68d8c49cf07ec83ffd745d
author TreeHugger Robot <treehugger-gerrit@google.com> 1650342164 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650342164 +0000

[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 45efd40ef2 -s ours

am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c032 is already in history

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

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