[automerger skipped] Merge "Split base.mk into system and vendor parts." am: 351a147cd7 -s ours am: 3a9fa70d5a -s ours

am: e1868a8d64  -s ours

Change-Id: I9bcdfd8bc5560796c081ca8950fde4173475fa98
This commit is contained in:
Anton Hansson 2018-06-27 01:41:43 -07:00 committed by android-build-merger
commit 3590fc514c

Diff Content Not Available