tree ca10ef1001d9e1066979d878f9238fdb01d6d182
parent a34ba7f2842d3469b5a34f182b91047e414d8ebb
parent 7d58605e6b039ff4ea61aa8cdc656d97f59daa55
author Adam Seaton <aseaton@google.com> 1495221034 +0000
committer android-build-merger <android-build-merger@google.com> 1495221034 +0000

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a  -s ours am: 387e0bb99a  -s ours am: a871e8ff81 am: d872742f52  -s ours am: 2e17d83fcd am: 18e5f9b4f6
am: 7d58605e6b

Change-Id: I517e0d561a688139c612b12168b19df9bd4db174