OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 11 Oct 2016 07:21:06 +0000 (07:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 07:21:06 +0000 (07:21 +0000)
am: 47b8a77785  -s ours

Change-Id: If640c3620ec35d1ec4a4896ed182f0565f29c180


Trivial merge