OSDN Git Service

Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
  Import translations. DO NOT MERGE


Trivial merge