OSDN Git Service

Merge changes Iee17fa80,Id9ee50be into lmp-dev
authorAdam Seaton <aseaton@google.com>
Wed, 12 Apr 2017 22:50:45 +0000 (22:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 22:50:45 +0000 (22:50 +0000)
commit9e63540d015ba0a2d6f3c8c3f3090e3cfd13fd2c
treef493f0d4f6643a481753c4b0e3e255723240132a
parent2d14a7da35723e2667bf317bea58cd61c3342fd6
parent91a21e9d12b1bd1f9a7f321576aa121f0dc11bf6
Merge changes Iee17fa80,Id9ee50be into lmp-dev

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