tree 877d4e1aecd84a4cb7657645f5da9e33502a4d21
parent 8294b64493f714f3cbf5fa9cb882e3b1db9b067d
parent ec42d2e0a5f1d457f522e0eb8e78b3a9586add68
author Adam Seaton <aseaton@google.com> 1495221755 +0000
committer android-build-merger <android-build-merger@google.com> 1495221755 +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 am: ad860c3d0d  -s ours am: ee22290a47 am: 7b94aecada am: 7fe1da4f84 am: eaf073cbee
am: ec42d2e0a5

Change-Id: If34438154b69fc5612e4ada7c15ad6d62221f5c8