resolved conflicts for f4fc29b0 to mnc-dr-dev-plus-aosp (20297913) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,6 @@ OPTIONS.full_bootloader = False
		OPTIONS.cache_size = None
		OPTIONS.stash_threshold = 0.8


		def MostPopularKey(d, default):
		"""Given a dict, return the key corresponding to the largest
		value. Returns 'default' if the dict is empty."""