OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: d5e72b250f -s ours
authorBill Yi <byi@google.com>
Thu, 11 May 2017 10:13:57 +0000 (10:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 10:13:57 +0000 (10:13 +0000)
am: d7989d1ae9  -s ours

Change-Id: Iaf574ef567bc8494152ebf086ecfdf17fd421571


Trivial merge