OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am...
authorBill Yi <byi@google.com>
Thu, 14 Sep 2017 00:53:06 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 00:53:06 +0000 (00:53 +0000)
am: 8d1cdbb135  -s ours

Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666


Trivial merge