OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)
am: 17acd3d1c8  -s ours

Change-Id: I1813ac496b209342c8326a8107b2597691f16da1


Trivial merge