am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."

author Elliott Hughes <enh@google.com>

Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)

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

Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)
author Elliott Hughes <enh@google.com>
Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/combo/arch/arm/armv7-a-neon.mk
Simple merge
author	Elliott Hughes <enh@google.com>
	Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 15 Feb 2013 01:31:40 +0000 (17:31 -0800)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/arch/arm/armv7-a-neon.mk	patch \|	diff1 \|	diff2 \|	blob \| history