OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)
commitd650629364b698dc6bd7b4dd6b24c653b3a9a95b
treeb597481efd795944a056026dfb561f8cdb35c47e
parent4eb906a672a9881679a19f36d4c73592c1b3b870
parent11465af11ea4458e7757ecf46b046c2c887a3810
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 11465af11e  -s ours

Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821