OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 08:18:10 +0000 (08:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 08:18:10 +0000 (08:18 +0000)
commit101cf38a40472c0ed72e2ecb5f6c5602bd592a22
treedf5c05cea6e77408a51e43d3cf45a92a4e1a60ed
parentb56bbb9dcb73ed0dfaf304b7ec8a442d29bb0e1e
parent0ad45f6f7661c8a5ad3e053559713c78e9176020
Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours
am: 0ad45f6f76  -s ours

Change-Id: If23b7854224ec5320d2f912686deb3da10d34efb