OSDN Git Service

Merge changes Id4d040ea,I318fb1fc into mnc-dev
authorAdam Seaton <aseaton@google.com>
Tue, 23 May 2017 17:28:27 +0000 (17:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 May 2017 17:28:28 +0000 (17:28 +0000)
* changes:
  [DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev bug:38342695
  [DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev bug:38342695


Trivial merge