tree 4b96a1821df39929bbb5fac33783d9eac926f030
parent d7ae21027224fb00c6851f073345432c0fc5ce70
parent 57370e1f68c9db562f9e78c66d18f6fcdf3a3db1
author Adam Seaton <aseaton@google.com> 1474481220 +0000
committer android-build-merger <android-build-merger@google.com> 1474481220 +0000

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

Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d