OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)
am: 3346da7da4  -s ours

Change-Id: I18cc399f3c272ce09f484f31d6aa7affeba00f91


Trivial merge