tree 3f4b09514b95cc734221a9d1753e25fcc093f1ce
parent 9502adc083f5d4fd6d2709b851d8f3cdb618414e
parent 5c25a15889520e2640460dbd40e003dd995c3f59
author Adam Seaton <aseaton@google.com> 1489683321 +0000
committer android-build-merger <android-build-merger@google.com> 1489683321 +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  -s ours
am: 5c25a15889  -s ours

Change-Id: Ic0c58ae21cd98dc6c5af070d9d99e2752418cff6