tree 8983e709018668660239a10e02ed4077f365c6f6
parent e3b6b636cf15fee9c041cf789fd16302642219ee
parent 0c614c7018186b3b5344de0e80cef6a89913d59a
author Andreas Gampe <agampe@google.com> 1507654237 +0000
committer android-build-merger <android-build-merger@google.com> 1507654237 +0000

Merge "{Event,Security}Log: Unify code"
am: 0c614c7018

Change-Id: Id43119d11e27b0e0f6bf064e3aa76f8c990b64a4