OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 682ff5562c -s ours
authorBill Yi <byi@google.com>
Thu, 17 Aug 2017 15:43:43 +0000 (15:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 15:43:43 +0000 (15:43 +0000)
am: 7189b42b4e  -s ours

Change-Id: I75bdc4b95f5f693ac00deecd7a4f729e01b711a9


Trivial merge