OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:59:12 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:59:12 +0000 (17:59 +0000)
commitcc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf
tree808860d8a26062a46308fdbec5e39d1cea3c3544
parent6c4a3962e7090451da516c56a6da0b3c816e046d
parent10e29e0730c21cb8a2cfe74b43792fa3a5705195
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5