OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7c1b73eab7 -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:22:12 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:22:12 +0000 (17:22 +0000)
am: 0412212ef1  -s ours

Change-Id: Iad4bbdabecda86f3ba1420a8fcfa3c7b3e2a7752


Trivial merge