OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f7a7712d50 -s ours
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:10:05 +0000 (16:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:10:05 +0000 (16:10 +0000)
am: 4df6ac860e  -s ours

Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade


Trivial merge