[automerger skipped] Merge "Split base.mk into system and vendor parts." into stage-aosp-master

am: 8500a01e0c  -s ours

Change-Id: I99bbf7569cdbb15d6c4f9c6e31e58c1321f28445
This commit is contained in:
Anton Hansson
2018-06-26 15:08:30 -07:00
committed by android-build-merger

Diff Content Not Available