OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Thu, 25 Jan 2018 19:15:45 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 19:15:45 +0000 (19:15 +0000)
am: 28815c5b0e  -s ours

Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2


Trivial merge