OSDN Git Service

Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
  Import translations. DO NOT MERGE


Trivial merge