OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529 -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)
am: 47bb41b1bb  -s ours

Change-Id: I12c93763e3ab6bb471c9e7049789fdc2e65406e4


Trivial merge