tree 938f290adffafa26f067732d9aa4a1a900fd94e9
parent 1899a63f1d804693e876d1fb2ce451c0713d6ac1
parent 5868fb70b367ea83643f3e9ca15f175bd56a73aa
author Adam Seaton <aseaton@google.com> 1495222716 +0000
committer android-build-merger <android-build-merger@google.com> 1495222716 +0000

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781  -s ours am: bf2d4968da  -s ours am: 05965e37e6 am: b3219be744  -s ours am: 025c26de91
am: 5868fb70b3

Change-Id: I14f5bcd5373daa4b17d82f71bb873fef2b80ff12