OSDN Git Service

Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)
commita86ba9b6e53e5c11d4102463332d47479a98a978
treeb6a94ec304ea77c9a170ece46d9d5687d0fc7152
parent70060539aae86f66a1daf2a5bfaab20f9c36c82c
parent1c6bdf517440e913600f835ceed2dd3d3cd59fdb
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688
  [automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
  Import translations. DO NOT MERGE