OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 29 Apr 2017 18:22:29 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 18:22:29 +0000 (18:22 +0000)
commit5a4a417a665eec7d45aef46101cfaf63003cca50
tree6f5f0b49c4b283b1cc20ca97a46668e012a922cd
parent4be5c41542b0b70ed43249918e16f8a6fa61ab8c
parentd95344d8aaf466ffaf62ffc3384019e99038ded9
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d95344d8aa  -s ours

Change-Id: I0b97a8efe7a09d1b37d756a43efa4af083120d67