OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1b93d5c5a1 -s ours
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:49:49 +0000 (06:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:49:49 +0000 (06:49 +0000)
am: 8e4618bca6  -s ours

Change-Id: Ibfdf60ceeade0025ec643e04bf675cca752f5990


Trivial merge