tree 1fb3688a303052887c9f1991c7de2307edd6b0f7
parent 7135eb8c35049a560a7fce9dff949cf1d0548a0e
parent afe3571d78f60906aad5a9b883da7ea6b48ede29
author Sami Kyostila <skyostil@google.com> 1522073071 +0000
committer android-build-merger <android-build-merger@google.com> 1522073071 +0000

Merge "Record incident details into the trace" am: a4cfa1c991
am: afe3571d78

Change-Id: I3a97cd2f15d1129a46e5bef9df2761b09b0fba2d