OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 126ce95bc6 -s ours am: 07a57fc90b ...
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 16:15:40 +0000 (16:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 16:15:40 +0000 (16:15 +0000)
am: a659760862  -s ours

Change-Id: I708b16b0e9daf87a9605107c7c4451eb67ebb189


Trivial merge