am b7e6e8bb: Merge "Support to configure and build multiple custom images."

author Ying Wang <wangying@google.com>

Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)

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

Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)
author Ying Wang <wangying@google.com>
Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 3 Jun 2015 17:11:10 +0000 (17:11 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history