resolve merge conflicts of 08a3a32fa9 to nyc-dev (84bc4b78) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -1423,6 +1423,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
		if oem_props is not None and len(oem_props) > 0:
		if OPTIONS.oem_source is None:
		raise common.ExternalError("OEM source required for this build")
		if not OPTIONS.oem_no_mount:
		script.Mount("/oem", recovery_mount_options)
		oem_dict = common.LoadDictionaryFromLines(
		open(OPTIONS.oem_source).readlines())