OSDN Git Service

Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
  Import translations. DO NOT MERGE


Trivial merge