OSDN Git Service

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE


Trivial merge