OSDN Git Service

Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)
commit9ede115c2bbe43beb684d5a8529963ebb177a2d4
treeb6a94ec304ea77c9a170ece46d9d5687d0fc7152
parentc6c611293d8eba92084b1c857457ecdfa1c53ce3
parent81a6ef98f31821751ddb81f088e93b0971866de5
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862
  Import translations. DO NOT MERGE