OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 16 May 2017 18:56:37 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 18:56:37 +0000 (18:56 +0000)
am: 4dc5766846  -s ours

Change-Id: I078ec6f2ba23670a233f069c578a9a65c2e21c23


Trivial merge