tree cef6fcb06e2c569e77ab1646a94dc06b05274b3a
parent dd1ec4be832f17b10b12077603d925bac11b6c95
parent 5f1d48b026fa495880d7dc083fbfe4d7f291157e
author Hector Dearman <hjd@google.com> 1521669065 +0000
committer android-build-merger <android-build-merger@google.com> 1521669065 +0000

Merge "perfetto: Add a testing program" am: 96928abe66 am: 91ac21a7fc
am: 5f1d48b026

Change-Id: I31f2d87ce58297564546e9f2dfc19047ea768604