OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 62b2950374 -s ours
authorBill Yi <byi@google.com>
Thu, 27 Apr 2017 00:01:55 +0000 (00:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Apr 2017 00:01:55 +0000 (00:01 +0000)
am: 4e76a58aaf  -s ours

Change-Id: Ib1630ce211565e8c848d14106f46c41c9785c28f


Trivial merge