OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:10:47 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:10:47 +0000 (17:10 +0000)
commit85de7f20ab6ef5a1d20124b985e4d0faf7dee0c7
tree191e2361dfcc1ec1681b27c24e79e85c76ab602a
parent3346da7da462520c52f6507968dd822ada6c7984
parent51e35963ae658f6285cd327c075b6be2be50b263
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 51e35963ae  -s ours

Change-Id: I53aee6f670b5d08d1572f5542ede9cf9ded2bf3e