tree 27e0aa89e68dd9c15fef5e9caf3cb5c4c9ec41c2
parent 427f322aab4084d3e4cee6867eb1c68f37ba1733
parent 1b317b7b61967805bf17dfd9874eacfa6841cbba
author Adam Seaton <aseaton@google.com> 1489683682 +0000
committer android-build-merger <android-build-merger@google.com> 1489683682 +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 am: bbc95c4952 am: 6137f438b9 am: 27eef63655
am: 1b317b7b61  -s ours

Change-Id: I39640e00ddcd44ed8aec2acde7e507078e16441b