OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)
am: 178e861e6e  -s ours

Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084


Trivial merge