OSDN Git Service

Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0
  Import translations. DO NOT MERGE


Trivial merge