OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Fri, 27 Jan 2017 00:38:24 +0000 (00:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 00:38:24 +0000 (00:38 +0000)
commitfe6ad95cdce924deae1d58299c1646ceec0c7ba3
treedc02874e66b1ae36bc0bb740325a710d8270c477
parentffc4f0e83c0c19cda974454551fc820590b030c9
parent6470caa2e21a0be2ad17522369e2eb410f4dad0f
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 6470caa2e2  -s ours

Change-Id: I6cea2b032629810b13efba6e2efb18ba2e1e7b0f