OSDN Git Service

Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)
commit515700b4feb35ac615c8ca38165f629a67c4d99f
tree493de619ff05f9c63ad18a2ce8afa99dc057c91d
parentd0025407dfb8b601f154c433459abd199f4191ff
parent976bb372c3b70d37f5336c32faeca09df524f5c2
Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96
  Import translations. DO NOT MERGE