OSDN Git Service

Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
authorAdam Seaton <aseaton@google.com>
Tue, 23 May 2017 17:28:56 +0000 (17:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 May 2017 17:29:00 +0000 (17:29 +0000)
commit95f77a84d938a11015b802ed18484b2b84f5f9b6
treeae98ae48f4ca78e1753730d782a470fc7870049a
parentfc30cdc48026fa6fcbcf116810c305e6f22b08a1
parent96d958c34509a65e5f7787945f9923fb44c42f05
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev

* changes:
  [DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695
  [DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695