tree 8260c5286fa08f2d1bd89e197891a4a8122121e5
parent 0ea40f86fe628d79e207af03ffb95b8607c8d872
parent 5673cc319b931ae26d0567c31f95e4259e336ee3
author Adam Seaton <aseaton@google.com> 1474482123 +0000
committer android-build-merger <android-build-merger@google.com> 1474482123 +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 am: e8e35c0327
am: 5673cc319b

Change-Id: I3c89353174d4c1033e1d8e4935217c888ee0a859