StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of a4a50996 to master

Browse Source 
Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
This commit is contained in:
Doug Zongker
2010-09-03 13:22:38 -07:00
parent f06675e2a4 a4a50996ac
commit c60c1bafa0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/ota_from_target_files
View File

@@ -887,7 +887,8 @@ def main(argv):
"no_prereq", "no_prereq",
"extra_script=", "extra_script=",
"worker_threads=", "worker_threads=",
"aslr_mode="], "aslr_mode=",
],
extra_option_handler=option_handler) extra_option_handler=option_handler)
if len(args) != 2: if len(args) != 2: