tree a89775faa72413dc570f55faf284d5523e062c79
parent 7c738120f9887fb03c4fda8180e932ee37f7910b
parent 0b5a877f21d514a0a6fe2773a381f2ce701cdda7
author Christopher Parsons <cparsons@google.com> 1696531679 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696531679 +0000

Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f21

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

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