tree 48bf551b98ff621ec1efbdb5375513ac86272431
parent b60d49c21c3cedeeb4683aac93dae708ad787724
parent 4e373a790458d36d15c795bb56dc8555b822d380
author Jihoon Kang <jihoonkang@google.com> 1724881938 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1724881938 +0000

Merge changes Ia693c4a5,I8e5620d2 into main am: c14be38f1a am: 4e373a7904

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

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