OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: d406f38d24 -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:56:45 +0000 (12:56 +0000)
commita23e69f247034ef9f8f1ee4c056afbc480d14419
tree0735977de7dc830a8bdfd4c2f222eb90873619a1
parentf226cca28b0494984f49a072980c2be7a1165e1a
parent08947751fd57a1da6a3f0f1fa38e1d9ab0593b0e
Merge "Import translations. DO NOT MERGE" into oc-dev am: d406f38d24  -s ours
am: 08947751fd  -s ours

Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50