OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours am...
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 08:18:38 +0000 (08:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:18:38 +0000 (08:18 +0000)
commitd45aaae8661aed5b2f32017ba222a74fc6d793e4
treef120441bf4b991c049fe4f30de8073d7515081e0
parentca96da9718a7d85fdfffe2e8a23e88a15e0be341
parent52eb8912006e599e2e0bd756d30b9657850a7c09
Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7  -s ours am: e637b663e8  -s ours
am: 52eb891200  -s ours

Change-Id: Ie74f6de413268659df89f43356ffbc6be208ec74