[automerger skipped] Merge "Move manifest merger config to Soong"
am: 5c83c19538
-s ours
Change-Id: Ia559e6615b44713d048f45d1d77c2115aed3b637
This commit is contained in:
am: 5c83c19538
-s ours
Change-Id: Ia559e6615b44713d048f45d1d77c2115aed3b637