am a8355eca: am 64f3a191: Merge "Multilib support for odex"

author Brian Carlstrom <bdc@google.com>

Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)

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

Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)
author Brian Carlstrom <bdc@google.com>
Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/package_internal.mk
Simple merge
author	Brian Carlstrom <bdc@google.com>
	Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history