OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)
commitbd14c44fd81d06f43cc627fd0f1a9bd38d3f4bfb
tree9f918957a528605a37defb5293e029784c60a20a
parentc344f9b1c7f25b5bed5252bb1f1c122e4906dfa7
parentd5a7faea838f550c411a1e46bb67227129d79adc
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours
am: d5a7faea83  -s ours

Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab