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:53:35 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:53:35 +0000 (16:53 +0000)
commit640d1083a7edf3fb7959dd9bd36b11506f9c8565
treec39bbee8debf15cb55f82acc82d6fb156ed03581
parentd0e0340fa4df7c9e2751d80a6ce5ba996e2c3d93
parent233d75bf96cf14dfdf352930936e2bf50da30c82
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c  -s ours am: 3346da7da4  -s ours
am: 233d75bf96  -s ours

Change-Id: I73aaf49a337d250838e954e434c34d9a008d9c99