OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20 -s ours
authorBill Yi <byi@google.com>
Wed, 27 Apr 2016 20:38:21 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 20:38:21 +0000 (20:38 +0000)
commit81c42238e00dc8a6c0664904bf02508d9f31517b
treefd953ca25dcaa503c3e9366ba9abd2bb6eda5f04
parent82c9b8a36181aead5be12aeb19722860db59444f
parent1e21b15db1d9fdcbacbee7b336327e69a8f57ae4
Merge "Import translations. DO NOT MERGE" into nyc-dev am: eb50d20  -s ours
am: 1e21b15  -s ours

* commit '1e21b15db1d9fdcbacbee7b336327e69a8f57ae4':

Change-Id: I176bff105a47e4f27e2f82957a96752c6a68f45d