OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)
commit059137469b1958b67ff9d4748a1ba72c923527af
tree096424997f422b24a2175f5cc25ab14e56a498d1
parenteb5a73f4eccbcf4f70ae23c32a41e21a7483533f
parent4d00a9512af492aef79617c7694432244b96cb29
Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours
am: 4d00a9512a  -s ours

Change-Id: I30da215979e10c5ea3ad63cc24c46dfe1a0a9ceb