OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f -s ours
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:06:09 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:06:09 +0000 (20:06 +0000)
am: 503eab4469  -s ours

Change-Id: I4144956fc0670fb706b11348ae140c122cde81a7


Trivial merge