resolved conflicts for merge of a4a50996 to master

Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
2010-09-03 13:22:38 -07:00
parent f06675e2a4 a4a50996ac
commit c60c1bafa0
1 changed files with 2 additions and 1 deletions
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -887,7 +887,8 @@ def main(argv):
                                              "no_prereq",
                                              "extra_script=",
                                              "worker_threads=",
-                                              "aslr_mode="],
+                                              "aslr_mode=",
+                                              ],
                             extra_option_handler=option_handler)

  if len(args) != 2: