OSDN Git Service

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

Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5


Trivial merge