OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)
am: 5a4b06803d  -s ours

Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b


Trivial merge