tree 9054ee222c24697ed607d03ed18e9feb956652e7
parent 814909b0f3e92e7c3c6033cd58d4696927e5a109
parent 91eaa6316a3d52ac380786cbccda529e75e2ca35
author Colin Cross <ccross@android.com> 1635622648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635622648 +0000

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

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

Change-Id: Ida831ee9684ce97052443a012d5c4986c0d4399c