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:56:45 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)
am: 08947751fd  -s ours

Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50


Trivial merge