am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.

author Tao Bao <tbao@google.com>

Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)

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

Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)
author Tao Bao <tbao@google.com>
Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +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>
	Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)
		1	2
tools/releasetools/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/ota_from_target_files.py	patch \|	diff1 \|	diff2 \|	blob \| history