OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 22:58:37 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 22:58:37 +0000 (22:58 +0000)
am: f66ddc099a  -s ours

Change-Id: I7b1e4d157af0263064fc7de6e717c8804616f216


Trivial merge