Merge "Ensure that merge_target_files.py prints INFO level logs." am: f6baf822ac am: d4b082e369

Change-Id: Ic7aaf7de258e6896f6f0a4a59eeea066456b4a93

tools/releasetools/merge_target_files.py

@@ -95,6 +95,8 @@ import ota_from_target_files
 logger = logging.getLogger(__name__)
 
 OPTIONS = common.OPTIONS
+# Always turn on verbose logging.
+OPTIONS.verbose = True
 OPTIONS.framework_target_files = None
 OPTIONS.framework_item_list = None
 OPTIONS.framework_misc_info_keys = None
@@ -1109,9 +1111,6 @@ def main():
     common.Usage(__doc__)
     sys.exit(1)
 
-  # Always turn on verbose logging.
-  OPTIONS.verbose = True
-
   if OPTIONS.framework_item_list:
     framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
   else: