tree 11d18f8bac3c493b880139174f16b7c7f2b166c7
parent 1802fc7882e2f37978b8faee0a906d615972d882
parent f8fa4b83522dc6966d5f90565d20c72c23ea3dee
author Andreas Gampe <agampe@google.com> 1507592228 +0000
committer android-build-merger <android-build-merger@google.com> 1507592228 +0000

Merge "EventLog: Check for exception after add()" am: c30a6ac2f1
am: f8fa4b8352

Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113