OSDN Git Service

Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 1 Oct 2018 05:42:36 +0000 (05:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 Oct 2018 05:42:36 +0000 (05:42 +0000)
commiteb92e99a064d3b82f23d02977910212a84e4191e
tree63089d693436e38af49066f5bc1fd5fc972eea54
parent1825d87bc769c54b04dd89b9e6766ff66591f565
parent5bf6376615cbba3b5741681d9a9a6a1ebde8fb07
Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905
  Import translations. DO NOT MERGE