am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"

author Ying Wang <wangying@android.com>

Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)

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

Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)
author Ying Wang <wangying@android.com>
Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)
diff --cc core/Makefile
Simple merge
diff --cc core/config.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history