OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)
commitbd429f42cb619e3d160d1cf0342e0e2933799e5f
tree7970f36a589f62c95b51d22697d66a67ff07d493
parent1e69f27a415bf87cc0f05a6205a41cdcce697ab8
parent402abcc9df902d94de0478357224dea2693b3e98
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df  -s ours

Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd