tree f043d104a4c787a5b28847210bd1217189fff60f
parent e1a37d81893feaa75a90cc1de38a9c9385cb6d48
parent dd5653bbf06b511d7bb1e20cbe02613748185a81
author Treehugger Robot <treehugger-gerrit@google.com> 1680728667 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680728667 +0000

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

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

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