resolved conflicts for f4fc29b0 to mnc-dr-dev-plus-aosp

Change-Id: Ieee6621881ace1631ae53d2a5879c271ba45382f
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index dd33646..4a0d100 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -134,7 +134,6 @@
 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."""