OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c5c -s ours
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 17:08:41 +0000 (17:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 17:08:41 +0000 (17:08 +0000)
am: 0e0b89a3e9  -s ours

Change-Id: I07267b6b14b2f96fc1321d003b19f5138808fd73


Trivial merge