OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)
commit15094560a484e3d112e5c0c759a20d8d57d976c4
tree8ce83c4f04fa699c1b87373f549261925524feff
parentebc74796e456353ba03b725156fb7d300ba3cab8
parent7fc501184ac64f2bdc420dfd03c64b698ca50e4a
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7fc501184a  -s ours

Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4