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)
commitc844ea5c96bebd5ea3aa4cf13eb9ce68782b7513
treeb6a94ec304ea77c9a170ece46d9d5687d0fc7152
parenta86ba9b6e53e5c11d4102463332d47479a98a978
parentf3df46779d10dffe3875669495a7a1da61fb2f4c
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev

* 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