am 8f7338d9: am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."

author Dan Albert <danalbert@google.com>

Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)

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

Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)
author Dan Albert <danalbert@google.com>
Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/clang/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Dan Albert <danalbert@google.com>
	Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 2 Apr 2015 18:49:26 +0000 (18:49 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clang/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history