OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: f1730bee90 -s ours
authorBill Yi <byi@google.com>
Thu, 11 May 2017 11:50:09 +0000 (11:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 11:50:09 +0000 (11:50 +0000)
am: ee8789939e  -s ours

Change-Id: I4078ac746b6c2382d26ef9a1aa750c09bd414ede


Trivial merge