OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s ours am...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:01:40 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:01:40 +0000 (18:01 +0000)
commitcf2a88659adadb583711d5e4de5f080c6e596631
tree5b7e090af1ef3948565cfe37dd45d5b15efa3ec5
parent6d2e800c85a0d3ceab9e3601d6cbac13a6ffeeac
parent75dd2c4a8acc71c10fdbb73b013ce0b682ff35f0
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795  -s ours am: 8fd0698ddc  -s ours
am: 75dd2c4a8a  -s ours

Change-Id: Idf654556814f532c862c79d5fa641b795a3898bb