OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am...
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)
commitf6c335b35343d7ba07deaf0e50d3915f4c081ffe
tree21fae73df9b543a27b7c4a81e0008a11315a5487
parent39d480e67c0afa6dcb3c9fb78b603d4e5f609778
parentbd14c44fd81d06f43cc627fd0f1a9bd38d3f4bfb
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours
am: bd14c44fd8  -s ours

Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8