[automerger skipped] Merge "Remove core.mk." into stage-aosp-master

am: 9c96dcaa87  -s ours

Change-Id: I3ccf2cd5efcb74e14083e40f72dce1e439d53771
This commit is contained in:
Anton Hansson
2018-06-20 10:47:09 -07:00
committed by android-build-merger

Diff Content Not Available