tree c0a9b0f69b5e8c49e3f5995dc67e9cfdcd029e15
parent 9e96e041bf3c9d5b57b11f921c6339e076478a7a
parent 98c1add8d047381bc8d325d0069170600d2b3388
author Anton Hansson <hansson@google.com> 1530097882 -0700
committer android-build-merger <android-build-merger@google.com> 1530097882 -0700

Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356
am: 98c1add8d0

Change-Id: I7f33e9934066f2babd08a67667b3f70742c13401