OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am...
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 20:30:35 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 20:30:35 +0000 (20:30 +0000)
am: 5dd6a1c735  -s ours

Change-Id: I9c7854ba3ff5cac3da1e39e7fe48ba0b27a06e4a


Trivial merge