OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours...
authorBill Yi <byi@google.com>
Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)
am: 1ed1b99ad0  -s ours

Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed


Trivial merge