am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"

author Ying Wang <wangying@android.com>

Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)

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

Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)
author Ying Wang <wangying@android.com>
Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)
diff --cc core/combo/TARGET_linux-x86.mk

index 5f9e46b,c7cbcab..6a868d5

mode 100644,100755..100755
--- 1/core/combo/TARGET_linux-x86.mk
--- 2/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
diff --cc envsetup.sh
Simple merge
author	Ying Wang <wangying@android.com>
	Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Oct 2013 22:06:02 +0000 (15:06 -0700)
		1	2
core/combo/TARGET_linux-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history