OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)
am: 4d7111b0e9  -s ours

Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29


Trivial merge