tree 8ef73cc7d78598e43b9e2ad6a9b56014206b2ad8
parent baf29229ca92685ba764ff4f63275e5616a9db59
parent 645af9a3029a7d26650e9c916ae800aa1e853c0d
author Adam Seaton <aseaton@google.com> 1489682352 +0000
committer android-build-merger <android-build-merger@google.com> 1489682352 +0000

DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690
am: 645af9a302  -s ours

Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e