OSDN Git Service

Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
  [automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
  Import translations. DO NOT MERGE


Trivial merge