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)
commita2603bd360825d890d119bf28767187d569ebc82
tree1a841c0674acb862b364d9348571ba7c33922060
parent025c26de91e55dd4f985f4448aeb20d40e4c2bc1
parent7eb60e965a58ade17591f58e0e436722f5c2f16f
Merge changes Id4d040ea,I318fb1fc into mnc-dev

* 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