OSDN Git Service

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

Change-Id: I4aeb90be346036977929a62605b5c82050cbb36a


Trivial merge