am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"

author Narayan Kamath <narayan@google.com>

Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)

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

Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)
author Narayan Kamath <narayan@google.com>
Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)
diff --cc CleanSpec.mk
Simple merge
diff --cc core/config.mk
Simple merge
author	Narayan Kamath <narayan@google.com>
	Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 17 Jun 2014 10:05:13 +0000 (10:05 +0000)
		1	2
CleanSpec.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history