am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'

author Colin Cross <ccross@android.com>

Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)

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

Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)
author Colin Cross <ccross@android.com>
Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Colin Cross <ccross@android.com>
	Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 25 Mar 2014 23:48:13 +0000 (23:48 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history