OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)
commitff5416e5dc4c336473ce2d3bbc5e75089c0740ae
treef27993ec6c71e27f402c6f9d9067fa20cfe22907
parentb7d1a1fdc7be8cad5bde6b05236aa4614bd6c729
parent4c44a3059c41c5ae95d40be2a4514198e9bbc435
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4c44a3059c  -s ours

Change-Id: I0474490ef308e2df768be086ad76e8aae671891d