Merge \\"Remove obsolete MTD support from the releasetools scripts.\\" am: 63fc2b6766

author Elliott Hughes <enh@google.com>

Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)
author Elliott Hughes <enh@google.com>
Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)
diff --cc tools/releasetools/build_image.py
Simple merge
diff --cc tools/releasetools/common.py
Simple merge
author	Elliott Hughes <enh@google.com>
	Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)
		1	2
tools/releasetools/build_image.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/common.py	patch \|	diff1 \|	diff2 \|	blob \| history