tree 1e8fb101a5487e739851696000a0a1a71efaa8ae
parent f48e1e6cb3ce095aecbd215df55c0c319f6fdc6f
parent ceda55a70c4fa422b4059baad8ed5041eaa54838
author Adam Seaton <aseaton@google.com> 1474482424 +0000
committer android-build-merger <android-build-merger@google.com> 1474482424 +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 am: 5fd0f92405
am: ceda55a70c

Change-Id: I2fdef44649c093e248976cb1a99bf08dcec4bf90