OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3 -s ours
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 19:33:17 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 19:33:17 +0000 (19:33 +0000)
am: 500e07de70  -s ours

Change-Id: I2d593fdb256d9e4284e36b0f729b778742cb172f


Trivial merge