OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12bef8215e -s ours...
authorBill Yi <byi@google.com>
Tue, 11 Oct 2016 07:42:53 +0000 (07:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 07:42:53 +0000 (07:42 +0000)
am: 748f091c1d  -s ours

Change-Id: Iecfbe7257e1c5d7385c5d190941e9cd536b4fadf


Trivial merge