tree 31d9cca22ddf1de35fd8b2059247058e8367c1d1
parent 0dd56e764db5e302ad63cfc5fd0f670023db0fe2
parent 8d6607c91ef8b820e3ca5429364f363d23ee3187
author Adam Seaton <aseaton@google.com> 1489683685 +0000
committer android-build-merger <android-build-merger@google.com> 1489683685 +0000

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3  -s ours
am: 8d6607c91e

Change-Id: Ib95b40ac17c6fc7260b96248760699c314f570ab