tree b5c540cc5a3752b8153a804161bad1aeb5b943a4
parent 33affaa5e9f9ede62bb2fa06faecdfe9e1539172
parent fc1357bc0062a953ceb30e8845e86c2293506c2b
author Siva Velusamy <vsiva@google.com> 1433201357 +0000
committer android-build-merger <android-build-merger@google.com> 1433201357 +0000

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

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