OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 18:56:31 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 18:56:31 +0000 (18:56 +0000)
commitf331a01a154b3ca13aaeea2ca2c8420c671c28e7
treec62af4b581c1e9cfe7f00bc7edc913924548cbf9
parent0966a9085d797a3d990656c379b41bede770ed10
parent8f278a7e06cea0a3560ba4fec0f28e53d960250c
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 8f278a7e06  -s ours

Change-Id: Id255f1ceb395e545f87ed91bd31f619ea9bcb06f