OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: c0c868e359 -s ours
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 09:45:20 +0000 (09:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 09:45:20 +0000 (09:45 +0000)
am: 24ffb717a0  -s ours

Change-Id: I73c7832b07a9a5595d7b53bff3c2b251a40d7c24


Trivial merge