am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK...

author Ben Cheng <bccheng@google.com>

Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)

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

Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)
author Ben Cheng <bccheng@google.com>
Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
author	Ben Cheng <bccheng@google.com>
	Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 11 Apr 2014 17:10:37 +0000 (17:10 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history