tree 938f290adffafa26f067732d9aa4a1a900fd94e9
parent d236029c61dfc468cc61971dc6da6d4c619dfe1d
parent 18e5f9b4f67c2b2c4a033a50a4a0f1f1234bdbcc
author Adam Seaton <aseaton@google.com> 1495220944 +0000
committer android-build-merger <android-build-merger@google.com> 1495220944 +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

Change-Id: I80c6d7913223ff47d6943ddc1f3d509fb37f0afc