am ecc28e95: am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"

author Ying Wang <wangying@android.com>

Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)

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

Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)
author Ying Wang <wangying@android.com>
Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)
diff --cc core/combo/TARGET_linux-x86.mk
Simple merge
diff --cc core/combo/TARGET_linux-x86_64.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +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