OSDN Git Service

Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa
  [automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e
  Import translations. DO NOT MERGE


Trivial merge