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)
* 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


Trivial merge