OSDN Git Service

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)
commiteb9a92f942440596cf321099dfd91be594c7e9e1
treea2807258d6635b50fad8ffc458516f8892080657
parentbcf3392856b353f2b57569f2e0b0ebf5428b6db0
parenta9d64326ad910599f790fc44f84c0869b21aa8a7
Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199
  [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7
  Import translations. DO NOT MERGE