OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours
authorBill Yi <byi@google.com>
Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)
am: 1018a5d4a1  -s ours

Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd


Trivial merge