OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 17:58:32 +0000 (17:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 17:58:32 +0000 (17:58 +0000)
commit75dd2c4a8acc71c10fdbb73b013ce0b682ff35f0
tree6e84bc3413e99d3d9ac0583dd9e01b9ed0f3eddc
parentbfd676595162f17464328a96869036d3c5f42421
parent8fd0698ddcabe6223e013d635bac93b7f19a28a3
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795  -s ours
am: 8fd0698ddc  -s ours

Change-Id: Iba9ad4412ceb218efd5d21a591f420b3f4812878