OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9e8b15b953 -s ours
authorBill Yi <byi@google.com>
Thu, 5 Jan 2017 10:18:53 +0000 (10:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 10:18:53 +0000 (10:18 +0000)
am: c125e0ef17  -s ours

Change-Id: I31f30e18d69a1c53aead7d735b69d41a77bdc3df


Trivial merge