OSDN Git Service

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)
commit41ae4b7eae7e1844e70c282eed02471f8d83fb9d
treea2807258d6635b50fad8ffc458516f8892080657
parent19f08130b11ab6fb79bd98265a928c0ab1c6696a
parent77243e2d28d4d6f961c6b7c9f86accd22243bc1f
Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE