am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."

author Dan Albert <danalbert@google.com>

Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)

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

Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)
author Dan Albert <danalbert@google.com>
Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)
diff --cc core/clang/config.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Dan Albert <danalbert@google.com>
	Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 15 Apr 2015 22:56:21 +0000 (22:56 +0000)
		1	2
core/clang/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history