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)
am: e637b663e8  -s ours

Change-Id: Ia3a3e2f45af0f493327ab9dc64bdc20af791c5fa


Trivial merge