OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: d406f38d24 -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 12:58:10 +0000 (12:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:58:10 +0000 (12:58 +0000)
am: 8c311afb87  -s ours

Change-Id: Ic0d5736c5d040abc951562fdc984359f76e9e348


Trivial merge