tree c9b3711107026485db24275ba1978470232c401d
parent f84d2ddb50a63287afa2eb1ceeeab172157bc090
parent 2e17d83fcd2d2d114902590efe66016d4c0014fb
author Adam Seaton <aseaton@google.com> 1495220824 +0000
committer android-build-merger <android-build-merger@google.com> 1495220824 +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

Change-Id: I61c5d7645d592863b1abd03057c2dd638aac9c50