tree be866f13d984998737ffb58013cca71d6de6247a
parent 362b66718d3cc56c8fe7de069a2e0e8a4a0fe472
parent d8aef89b3fc04e1c17ff8a63b48ca3dc9825106a
author Primiano Tucci <primiano@google.com> 1523012714 -0700
committer android-build-merger <android-build-merger@google.com> 1523012714 -0700

Merge 4 perfetto fixes into into pi-dev
am: d8aef89b3f

Change-Id: Ib2b31ecd5ac7991537ac0671b607affb06654c58