tree f62f8e757ae4ac5cb05bfb66d67d453ef4fcc662
parent c4233bcb8e805ce06524f4f4ecfd9bdd2f8e684c
parent 87589b0faf4641674a58156b8b14c69434f98e30
author Elisa Pascual Trevino <elisapascual@google.com> 1510604891 +0000
committer android-build-merger <android-build-merger@google.com> 1510604891 +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

Change-Id: I2fd3754ca068edc5d0e4a79fcc5f17290a40431d