tree 46b5c4e337c9458826d3caa350dbd708ab002e33
parent 10c8949d7503bad5450543774d8c0364d8c1fc36
parent a68c55822c115db2151b1d155566a06b01756d20
author Zach Jang <zachjang@google.com> 1448068348 +0000
committer android-build-merger <android-build-merger@google.com> 1448068348 +0000

Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64  -s ours am: c7b96cdd5e am: 8909bdfc4a
am: a68c55822c

* commit 'a68c55822c115db2151b1d155566a06b01756d20':
  Update Security String to 2016-01-01 - DO NOT MERGE