tree 9fbb8a1df91324b02d45af046c2653336e5d3254
parent 9a805d9e3e891f1265a6c697b49e994f928f8ec6
parent 80f445482c78fac7c0282ac7db7a94b37e049fb5
author Adam Seaton <aseaton@google.com> 1492037382 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492037382 +0000

Merge changes I5c252cba,I80259eef into mnc-dev

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
  [DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev