OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)
am: 76e9bd72f9  -s ours

Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f


Trivial merge