releasetools: Fix mismerge

Change-Id: I11a48fb637b8b155c02c65500773aceb5d4bb376

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index a1ac10b..413166f 100755 (executable)
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -279,7 +279,7 @@ def LoadInfoDict(input_file, input_dir=None):
     d["fstab"] = None
   else:
     d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],
-                                   d.get("system_root_image", d["device_type"], False))
+                                   d.get("system_root_image", False), d["device_type"])
   d["build.prop"] = LoadBuildProp(read_helper)
   return d
 
@@ -302,7 +302,7 @@ def LoadDictionaryFromLines(lines):
       d[name] = value
   return d
 
-def LoadRecoveryFSTab(read_helper, fstab_version, type, system_root_image=False):
+def LoadRecoveryFSTab(read_helper, fstab_version, system_root_image=False, type):
   class Partition(object):
     def __init__(self, mount_point, fs_type, device, length, device2, context):
       self.mount_point = mount_point