OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 9 Feb 2017 11:36:58 +0000 (11:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Feb 2017 11:36:58 +0000 (11:36 +0000)
commitcde8fa7e9f1edd4c64d451c3ce3af2b763765c79
treeda0aad8537cf395d0ace84a9f53ad9805c5b1e4f
parent49e6b18eeb639076de52701198e1e756ef66b9f4
parent740ddc38bc267ac586badc63a301eb555ae631c4
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 740ddc38bc  -s ours

Change-Id: I967c516afc18ee97b2790cedd4747e8f93c57368