OSDN Git Service

Merge changes I5c252cba,I80259eef into mnc-dev
authorAdam Seaton <aseaton@google.com>
Wed, 12 Apr 2017 22:49:42 +0000 (22:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 22:49:42 +0000 (22:49 +0000)
* 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


Trivial merge