OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)
commit0c2bb34f5ce1b4cee2a23bba56c3bb719ca3cd79
tree98f1c612fad535a33049512b24d2bb680a2be158
parent665384a8eb46cfb0f4b9a269836c98e4479a9100
parent327b9119d7954901068f89dc9ac336687ce7931a
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I24da3a236478e91b06710a4065ba29663921f940