tree 72cc891fe9f7ebd79485fd50fb6ae39566d1b0c6
parent c443a1d2f541578b6aeecf57eaa6fcf26964d164
parent 2d3643c84add866fad105cd26bdb05ec28ef19d6
author Siva Velusamy <vsiva@google.com> 1433200942 +0000
committer android-build-merger <android-build-merger@google.com> 1433200942 +0000

Merge "Update default enabled tags to match systrace.py" into studio-1.3-dev
automerge: 2d3643c

* commit '2d3643c84add866fad105cd26bdb05ec28ef19d6':
  Update default enabled tags to match systrace.py