am 6a944e5e: am b9a8aa63: Merge "Fix prebuilts for target builds with USE_MINGW=1."

author Dan Albert <danalbert@google.com>

Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)

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

Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)
author Dan Albert <danalbert@google.com>
Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)
diff --cc core/combo/TARGET_linux-x86.mk
Simple merge
diff --cc core/combo/TARGET_linux-x86_64.mk
Simple merge
diff --cc core/envsetup.mk
Simple merge
author	Dan Albert <danalbert@google.com>
	Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 6 May 2015 22:44:27 +0000 (22:44 +0000)
		1	2
core/combo/TARGET_linux-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-x86_64.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history