OSDN Git Service

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01
  Import translations. DO NOT MERGE


Trivial merge