OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)
commit7790c15c2473a03afd9a5ed913cfb401dc81c620
treeeda0576faf9642cc05be8e09575b7fec0c3f1ec7
parentfff2b690ca88d14e5910082504d4cb34d1ad0663
parentc4e253af2abc0ff588e94338198fc0fb0de2398b
Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508  -s ours
am: c4e253af2a  -s ours

Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066