tree d7f37093fa2db94aa4ed0d47b0c6f17ebdb9a7a9
parent e0ce0ce31033df264c2ee80fcf4aa3e26e57440a
parent 0a9eb7f6579440475edb6c98bdcb32346c44befe
author Jooyung Han <jooyung@google.com> 1725413393 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725413393 +0000

Merge changes Ia9f2186e,Ibe567d3b into main am: 0a9eb7f657

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

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