tree 14d36d5e39b356d90eaf7464a0481d0e8364e9e3
parent af68a4935129ed6c5fc30e048f933aee627401cf
parent 702c3b28f78e28cae9a66fa1d7cf6040d018ece3
author Adam Seaton <aseaton@google.com> 1489683020 +0000
committer android-build-merger <android-build-merger@google.com> 1489683020 +0000

DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2 am: 7723fd8988  -s ours am: 26c199ecc2
am: 702c3b28f7

Change-Id: I46798e396f423639949c0d90d487c1fe01cf3d22