OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c7d9045105 -s ours
authorBill Yi <byi@google.com>
Mon, 20 Nov 2017 22:34:18 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Nov 2017 22:34:18 +0000 (22:34 +0000)
am: 651cb9ec20  -s ours

Change-Id: Ie35ab0514caa65270a0e53fbde8f5de3c0a920de


Trivial merge