OSDN Git Service

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
  Import translations. DO NOT MERGE


Trivial merge