tree f8d00901b3ded26c939b2f2fdf6396548cd08ab9
parent c184e47cc599470268e07b65a4350b1d975ee1f4
parent e13d8888a86208b2d2eca50a4a87dbe0948b76d0
author Adam Seaton <aseaton@google.com> 1474481371 +0000
committer android-build-merger <android-build-merger@google.com> 1474481371 +0000

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

Change-Id: I996544a25a9f2c8749039885ce28dfe25c86008f