am ebe0bacc: am 6837ac67: Merge "Refactor FDO support code to ensure arm64 can also...

author Ying Wang <wangying@android.com>

Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)

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

Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)
author Ying Wang <wangying@android.com>
Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history