OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s...
authorBill Yi <byi@google.com>
Thu, 27 Jul 2017 01:54:32 +0000 (01:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 01:54:32 +0000 (01:54 +0000)
am: 0f3e1194b1  -s ours

Change-Id: Id1501a1b8cb79140c608810f6580a8c7cb3660f4


Trivial merge