OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 25 Jul 2017 22:44:17 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 22:44:17 +0000 (22:44 +0000)
am: edfb7279ee  -s ours

Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563


Trivial merge