tree 50f4fb56b9abb263fcfcba7cc45a9992ef3d3ef7
parent c82851b46d3e48c3a9a3b50ac7fe7184023e838a
parent 8b64ad9506b3051db82ecbb00cd63ede8c135722
author Colin Cross <ccross@android.com> 1709238983 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709238983 +0000

Merge changes I8d060594,I2b6a57ae into main am: 5d55b66861 am: 8b64ad9506

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

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