OSDN Git Service

Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 1 Oct 2018 05:41:34 +0000 (05:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 Oct 2018 05:41:34 +0000 (05:41 +0000)
commit1825d87bc769c54b04dd89b9e6766ff66591f565
tree63089d693436e38af49066f5bc1fd5fc972eea54
parent8c53c6e4e3ef6d85d81af1ca0348f521c9cf0f8b
parent77b862002bbf8f39a8bcb9d2033ff9f0c5fcc551
Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a
  [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae
  Import translations. DO NOT MERGE