OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)
am: e231af6c88  -s ours

Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697


Trivial merge