tree fd1909d865eb9a2da8a6173dccb4f88c68fc7333
parent 2a7b60647ca782409590f3025f7b76d6cac2d0d7
parent 3a0164c5c2128316f0cb3d6c6aa616e061455a7f
author Lalit Maganti <lalitm@google.com> 1523486663 -0700
committer android-build-merger <android-build-merger@google.com> 1523486663 -0700

Merge "perfetto: further cleanup and consolidate test code" am: 563f7f6653 am: 9b180bff85
am: 3a0164c5c2

Change-Id: Id1def0026f876b2c805000a401a127147815de77