OSDN Git Service

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

Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5


Trivial merge