tree a4501d42672ca61c12e607d6702a77d78f777ead
parent e63569c787c72d314a0be6cc844344b91f7a95e8
parent a983e8e796caa6f50fba99cf87dce70866414d16
author Adam Seaton <aseaton@google.com> 1474481822 +0000
committer android-build-merger <android-build-merger@google.com> 1474481822 +0000

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2 am: 57370e1f68 am: e13d8888a8 am: 25019ad31d am: 3ffb2d23c2
am: a983e8e796

Change-Id: Iad93276510ea4f7742b91e9ca5bfeb7967f53294