OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours...
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:23:23 +0000 (05:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:23:23 +0000 (05:23 +0000)
am: d7546218b5  -s ours

Change-Id: Ib981dac3521a620263725bd684bb9ea618b0b966


Trivial merge