am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"

* commit '7f2e05e9a3f44528d9fa624da9386b01ccaa54a6':
  Fix incorrect exception handling in perfboot.py
This commit is contained in:
Yasuhiro Matsuda 2015-08-06 12:33:32 +00:00 committed by Android Git Automerger
commit 9e2ed7b080

View file

@ -203,7 +203,7 @@ def init_perf(device, output, record_list, tags):
output_results(output, record_list, tags)
if original_dropbox_max_files is not None:
restore_dropbox(device, original_dropbox_max_files)
except subprocess.CalledProcessError, RuntimeError:
except (subprocess.CalledProcessError, RuntimeError):
pass
atexit.register(cleanup)