resolved conflicts for merge of b122baf5 to master
Change-Id: I02464f1cace7bd01d59d2f2827976fa38a011bf2
diff --git a/trace-viewer/PRESUBMIT.py b/trace-viewer/PRESUBMIT.py
new file mode 100644
index 0000000..0d2b415
--- /dev/null
+++ b/trace-viewer/PRESUBMIT.py
@@ -0,0 +1,8 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+def CheckChangeOnUpload(input_api, output_api):
+ return []
+
+def CheckChangeOnCommit(input_api, output_api):
+ return []