am 9e55ed53: am 47316a27: am 5137d458: Merge "Force to build llvm from source in...

author Ying Wang <wangying@google.com>

Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)

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

Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)
author Ying Wang <wangying@google.com>
Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)
diff --cc core/clang/config.mk
Simple merge
diff --cc core/config.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)
		1	2
core/clang/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history