OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 08:14:54 +0000 (08:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:14:54 +0000 (08:14 +0000)
commit52eb8912006e599e2e0bd756d30b9657850a7c09
tree25fb3e9f0846f0482135e14ea8e15e6d6be5a0c4
parentc8752ca07ce8b7d0afeafe4f00687ea9bc88f501
parente637b663e883f3f9f9a08bea5be81795c197bc71
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7  -s ours
am: e637b663e8  -s ours

Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa