OSDN Git Service

resolve merge conflicts of 1e92cfb to stage-aosp-master am: 4cca8a5573
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 22:33:03 +0000 (22:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 22:33:03 +0000 (22:33 +0000)
commitab632c60b80d560a534b85fa20e3fab82d8ff92b
tree8205501f1e09cc6a3e2a9bf968d75b96eaa5335b
parent9568bfbd4c6fe090fb1bc1a55b6d953a60da3fff
parent2017d68910ac898881a66b1f31ccddbcc9cd7f7d
resolve merge conflicts of 1e92cfb to stage-aosp-master am: 4cca8a5573
am: 2017d68910

Change-Id: Ia182609f54288e2867b5aa0f0ca433c577dca7b9
core/clear_vars.mk