OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:45:10 +0000 (16:45 +0000)
commit233d75bf96cf14dfdf352930936e2bf50da30c82
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parent1412b5d927068c4ba19a88776a3612cb38a477f9
parent3346da7da462520c52f6507968dd822ada6c7984
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c  -s ours
am: 3346da7da4  -s ours

Change-Id: I18cc399f3c272ce09f484f31d6aa7affeba00f91