commit abd7782bd24fcdd998017c1559f7ff7f6e0c46ac
author Yasuhiro Matsuda <mazda@google.com> Thu Aug 06 12:43:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 12:43:37 2015 +0000
tree 334a2ad778232fad072f315258065f41b152bb04
parent ccd3cce7a4ce0ae54bacfcfd5636c2c6b8b3351a
parent c7c19ea136875f848ac4f3305ce6381cbb51f8c4

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

* commit 'fb35b7c463321eab207f8c445efb9ff0e303f6ed':
  Fix incorrect exception handling in perfboot.py

init/perfboot.py

diff --git a/init/perfboot.py b/init/perfboot.py
index 3d4940c..583d640 100755
--- a/init/perfboot.py
+++ b/init/perfboot.py
@@ -203,7 +203,7 @@
                 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)