OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 42e494228b -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 09:54:32 +0000 (09:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 09:54:32 +0000 (09:54 +0000)
am: af27a8fd5b  -s ours

Change-Id: Iec8c0e5e73100ebd98e09ac488684266796573b3


Trivial merge