OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 16 Jun 2017 15:21:03 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 15:21:03 +0000 (15:21 +0000)
commit9e58cfd0b0d8838f65f1b8c487950633d8b70ee8
treec938dd008302fa074bfed93cd009caef0e538166
parentaa1d82db9abd81b4f2188568bc2932b68592747b
parentd97c62a1da5bf60af0d80b848c96d409be651c64
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d97c62a1da  -s ours

Change-Id: I331b2a1135b82d21211ba75d838e655213da8654