OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978 -s ours
authorBill Yi <byi@google.com>
Tue, 8 Nov 2016 12:08:40 +0000 (12:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Nov 2016 12:08:40 +0000 (12:08 +0000)
am: 5501036062  -s ours

Change-Id: Idd14727a629fbd7eca5a1d81e7c56ad52053b2fb


Trivial merge