OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 19:50:09 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 19:50:09 +0000 (19:50 +0000)
am: 7604fe28e8  -s ours

Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972


Trivial merge