am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into ginge...

author Doug Zongker <dougz@android.com>

Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)

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

Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)
author Doug Zongker <dougz@android.com>
Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)
diff --cc tools/releasetools/common.py
Simple merge
diff --cc tools/releasetools/img_from_target_files
Simple merge
author	Doug Zongker <dougz@android.com>
	Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 17 Sep 2010 15:24:37 +0000 (08:24 -0700)
		1	2
tools/releasetools/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/img_from_target_files	patch \|	diff1 \|	diff2 \|	blob \| history