Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev

author Tao Bao <tbao@google.com>

Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)

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

Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
author Tao Bao <tbao@google.com>
Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
diff --cc tools/releasetools/common.py
Simple merge
diff --cc tools/releasetools/ota_from_target_files.py
Simple merge
author	Tao Bao <tbao@google.com>
	Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
		1	2
tools/releasetools/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/ota_from_target_files.py	patch \|	diff1 \|	diff2 \|	blob \| history