OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s...
authorBill Yi <byi@google.com>
Thu, 14 Sep 2017 02:27:53 +0000 (02:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 02:27:53 +0000 (02:27 +0000)
am: 00873a2e33  -s ours

Change-Id: Idd9a4ab6d9485b66ece4c2736d3ac41a2d20862c


Trivial merge