tree f4fc6ca0d7acd4577277d9792e6b92869d254245
parent 52977449a0216603e4dade9d46a970361d558888
parent 508ccd58fee9fb34a9b3a231f5e8395b1adeeeb2
author Ivan Lozano <ivanlozano@google.com> 1635859705 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635859705 +0000

Merge changes I2373d366,I908496d9 am: c7a4de25c1 am: 9729b0a9ed am: 8f7bf4891b am: 508ccd58fe

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

Change-Id: I996e05da9a23491a260273ff9ffa98fc61ff7064