am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"

author Jean-Baptiste Queru <jbq@google.com>

Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)

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

Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/combo/TARGET_linux-mips.mk
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 28 Aug 2012 20:41:09 +0000 (13:41 -0700)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-mips.mk	patch \|	diff1 \|	diff2 \|	blob \| history