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)
commite637b663e883f3f9f9a08bea5be81795c197bc71
treeeb3ee6a5ec794ef26f74697f73f755394329feda
parent0320d4e69fde0355c8843418fd9f10d820cdc7a9
parent327b9119d7954901068f89dc9ac336687ce7931a
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 327b9119d7  -s ours

Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4