OSDN Git Service

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
  Import translations. DO NOT MERGE


Trivial merge