OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 30 Mar 2017 01:52:16 +0000 (01:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 01:52:16 +0000 (01:52 +0000)
am: a53f8a9128  -s ours

Change-Id: I98c71241176416c95e810bc5e4b57e6150173dde


Trivial merge