tree 9054ee222c24697ed607d03ed18e9feb956652e7
parent f9b1f0b3d0f86988e39c824a399d4a471364a4ed
parent 19aa461cc07a2eded0a745c192cacb42758c1b00
author Colin Cross <ccross@android.com> 1635623735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635623735 +0000

Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0

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

Change-Id: I512a0433e8517e7062fb9929e2f80d48ae23036b