OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a2b301d0e1 -s ours
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:04:11 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:04:11 +0000 (05:04 +0000)
am: 68d6955b45  -s ours

Change-Id: I2b21eda80569335e44cf39c087e6dc4590d69d69


Trivial merge