am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."

author Ying Wang <wangying@google.com>

Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)

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

Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)
author Ying Wang <wangying@google.com>
Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history