OSDN Git Service

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE


Trivial merge