tree 1401c9412b41c065e14d5b6050516517eb297153
parent d32ecb0165b913959d0ed5d8a44957c471903b6d
parent 8597b21bb1b7b39378313083cf70154b84279fd8
author Andreas Gampe <agampe@google.com> 1507591401 +0000
committer android-build-merger <android-build-merger@google.com> 1507591401 +0000

Merge "SecurityLog: Apply 7b25bb8 to SecurityLog" am: a98866a6b6 am: a25528b085 am: 1802fc7882
am: 8597b21bb1

Change-Id: Ie13fff01d2305696e9e08f3529363206091d9b5a