[automerger skipped] Merge "Split base.mk into system and vendor parts."
am: 351a147cd7
-s ours
Change-Id: I08fd19e18ded0b99946fbb9f7a77e7e76ca6cedd
This commit is contained in:
commit
3a9fa70d5a
am: 351a147cd7
-s ours
Change-Id: I08fd19e18ded0b99946fbb9f7a77e7e76ca6cedd