tree 853c599feb5f6caf961047de970cdad9865da8cc
parent ec5ef1c8b3558c473a4c72b651f01b6722e21dfc
parent b39c51f1b33d98f58f1f5cb73a8ecf238085a0d0
author Elisa Pascual Trevino <elisapascual@google.com> 1510605387 +0000
committer android-build-merger <android-build-merger@google.com> 1510605387 +0000

Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5  -s ours am: 87589b0faf am: f686b8e219 am: 87aa71a0d6 am: 0646a5609f
am: b39c51f1b3  -s ours

Change-Id: I33895581acacee665d0e3881cab894145cc20c51