OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 5bb0b0b7e2 -s ours
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 09:55:54 +0000 (09:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 09:55:54 +0000 (09:55 +0000)
am: 0f880e61bd  -s ours

Change-Id: I4567fc8c2ea0d36ae54da016936f38c9b614e3cb


Trivial merge