OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Tue, 7 Feb 2017 17:28:13 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Feb 2017 17:28:13 +0000 (17:28 +0000)
commitfdb6ec031472f9143185b5aed6a8ea6b8a9b0aea
treefc3281feee3dcddf60500f36b952ca4c7facc047
parent2192d06b214a866c25327c0da52740ab5dc1e411
parent7e61e7c5852f628ec85217a6346979be58d298ab
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 7e61e7c585  -s ours

Change-Id: I541c140a9244f7671b3a09f19a4e0ff7acef4f0f