tree 65b7d917a11688b61d1f86c38e21e26d148a5585
parent 548b715b79bf48c5b4e41d44eab0a2fa65cab107
parent e7f7129cd02f120adaf400f383debb22d6174c7e
author Android Build Merger (Role) <android-build-merger@google.com> 1486403993 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486403997 +0000

Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849" into nyc-mr2-dev-plus-aosp am: 32e51130ad"