tree e1d45aa74e3b4be03735fd934cfdf6fda31f531f
parent 78deea9b79237781e2cf27614bef2d4c79514319
parent 45c9b1840dbb20eb4825d0a7022f50c9f92da860
author Primiano Tucci <primiano@google.com> 1522344710 +0000
committer android-build-merger <android-build-merger@google.com> 1522344710 +0000

Introduce "json" and "systrace" output in trace_to_text
am: 45c9b1840d

Change-Id: I82c57ef57954a67b686857dee392fb8bdc6db5da