am 1758fe1f: am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection...

author Ying Wang <wangying@google.com>

Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)

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

Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)
author Ying Wang <wangying@google.com>
Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 31 Mar 2014 17:43:57 +0000 (17:43 +0000)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history