am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_...

author Ying Wang <wangying@google.com>

Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)
author Ying Wang <wangying@google.com>
Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history