tree e689f140ea9f56ef5e476cf2be74cb0abcd3c469
parent 4b549521ab4ca91ae726679e0dde523939cc0a69
parent 10e01056fcef91257c842c610a5d2d77a5b024da
author Lalit Maganti <lalitm@google.com> 1520946658 +0000
committer android-build-merger <android-build-merger@google.com> 1520946658 +0000

Merge "perfetto: try to fix CTS test failure" am: a92e54b60a am: 58c430d75c
am: 10e01056fc

Change-Id: I0c1dea08bda91636faa513550fe8877666d15610