OSDN Git Service

Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)
commit71bd8398560dd300a839384f7001f8e7f7aeb9a8
treeab6484fa806d2e5c171a100fac1f02e8a9b5dcaf
parent9935787f3bc53936b565b6dc7c9d0d57a21fd8ac
parent0c31d81cd15b529f91070b1b00db9e9fb9e08ad5
Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
  Import translations. DO NOT MERGE