OSDN Git Service

resolve merge conflicts of 1e92cfb to stage-aosp-master am: 4cca8a5573 am: 2017d68910
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 22:52:00 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 22:52:00 +0000 (22:52 +0000)
commitfa886cdb2adb0f1631b2b3caa617eede0930e546
treeec9aeaeaea6bee6ed1b9e6962eda9af226f01f5c
parent16687c5ae5285c8b389ff8de1f68d1c62d7d8383
parentab632c60b80d560a534b85fa20e3fab82d8ff92b
resolve merge conflicts of 1e92cfb to stage-aosp-master am: 4cca8a5573 am: 2017d68910
am: ab632c60b8

Change-Id: I123f98c5d24ec63ca784d4e29b507f9501fbc2c0
core/definitions.mk