OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)
am: 327b9119d7  -s ours

Change-Id: I24da3a236478e91b06710a4065ba29663921f940


Trivial merge