am fe9ad097: am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm...

author Ying Wang <wangying@google.com>

Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)

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

Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)
author Ying Wang <wangying@google.com>
Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 11 Jun 2014 17:44:54 +0000 (17:44 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history