tree 15b322f16465a351b56cde35968eb17d549e70b9
parent 509ceec200206bd5df774d55fd7a5dcff3733325
parent c7a4de25c100e0c3e24186c5f2b4c9e959e928bc
author Ivan Lozano <ivanlozano@google.com> 1635857535 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635857535 +0000

Merge changes I2373d366,I908496d9 am: c7a4de25c1

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

Change-Id: Id7cf46fe0e98bf51d2e3a9364513d64f18e09466