am 1b4252cd: am 0f78b47b: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"

author Ying Wang <wangying@android.com>

Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)

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

Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)
author Ying Wang <wangying@android.com>
Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)
diff --cc core/combo/TARGET_linux-mips.mk
Simple merge
diff --cc core/combo/TARGET_linux-x86.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 21 Nov 2013 16:09:45 +0000 (08:09 -0800)
		1	2
core/combo/TARGET_linux-mips.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history