OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)
commit5e123b336af4e0d3be036389ed449199f77b6c70
treec62af4b581c1e9cfe7f00bc7edc913924548cbf9
parentc967ede5c83e039d0484f62097a29eb00e0c6d6a
parent11ea7e4283da556b1d0798508cd5c51cc9f7dd56
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 11ea7e4283  -s ours

Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a