OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:49:11 +0000 (12:49 +0000)
commit08947751fd57a1da6a3f0f1fa38e1d9ab0593b0e
tree997a8dea40f0bbcc6e7d6f66b2eb2e8ddf54b65a
parentfda69197b1ba5b1718e48fea20e6e07c2d7afa4d
parentd406f38d24476efee6f65207e88b03dc14ef2a05
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d406f38d24  -s ours

Change-Id: I45a76be2cec8829147d9ac4569da2087bf6722bd