tree ddb44ec8c26ef2da0ef2e3b787e5a48e2ac0618e
parent de348afd11929ee627c08eb456a9d4364c532b37
parent 273df2259c04ac58a586f66533539cdce0ee68ae
author Hector Dearman <hjd@google.com> 1522099813 +0000
committer android-build-merger <android-build-merger@google.com> 1522099813 +0000

Merge "perfetto: Add error message for confusing crash" am: c858d49021 am: 97da6b4ba4
am: 273df2259c

Change-Id: I67481b3e2851072fcfe6a0e33bdde2c67b491f6e