OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Thu, 25 Jan 2018 18:56:32 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 18:56:32 +0000 (18:56 +0000)
am: 0fa3646a34  -s ours

Change-Id: Icdd5b7e1f54acae9914fd79949584ce80d5a489c


Trivial merge