OSDN Git Service

Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)
commit57b2e38837699ba44275e534add6d3bf8088b963
tree63089d693436e38af49066f5bc1fd5fc972eea54
parent33be0d800af582df986ebfa84e2c30e9bd623fb7
parent0bc949205bfffe148ab5e7005c1016308b3dca9f
Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
  Import translations. DO NOT MERGE