OSDN Git Service

Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)
* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532
  [automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc
  Import translations. DO NOT MERGE


Trivial merge