am 830175fa: am b89e81dc: fs_config: align with new explicit fs_config target_out...

author Thierry Strudel <tstrudel@google.com>

Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)

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

Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)
author Thierry Strudel <tstrudel@google.com>
Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)
diff --cc ext4_utils/ext4_utils.h
Simple merge
diff --cc ext4_utils/make_ext4fs.c
Simple merge
author	Thierry Strudel <tstrudel@google.com>
	Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)
		1	2
ext4_utils/ext4_utils.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext4_utils/make_ext4fs.c	patch \|	diff1 \|	diff2 \|	blob \| history