am 98e0347a: am 2b3d7e8e: Merge "Open dexdump files in binary mode."

author Raphael Moll <ralf@android.com>

Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)

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

Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)
author Raphael Moll <ralf@android.com>
Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)
diff --cc libdex/CmdUtils.c
Simple merge
diff --cc libdex/ZipArchive.c
Simple merge
author	Raphael Moll <ralf@android.com>
	Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)
		1	2
libdex/CmdUtils.c	patch \|	diff1 \|	diff2 \|	blob \| history
libdex/ZipArchive.c	patch \|	diff1 \|	diff2 \|	blob \| history