OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 16 Feb 2017 15:46:11 +0000 (15:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 15:46:11 +0000 (15:46 +0000)
commit7ab32a6a1faec49220543e5502e1dd60d28d32ec
tree9e1ad945bb868dd10b9e76b17c079c47d54c3ad1
parent51df670652ba5229373ccb34a47d37718b8d89c7
parentd663b483d19770697b46cec2c411d52fc73bac51
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: d663b483d1  -s ours

Change-Id: I2ca0a1321763042be06e780dd89902810769ee3e