tree 58442b010d003437154960eda2230a732a0c9b5a
parent 4aced13de21f5dbbf304c446eb34d6929b04daf8
parent a68a0fe78059736742c1d0063704bae42941312a
author Treehugger Robot <treehugger-gerrit@google.com> 1680732455 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680732455 +0000

Merge "Fix issue merging bp2build files with handcrafted ones" am: dd5653bbf0 am: 71321b2547 am: a68a0fe780

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

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