OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am...
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)
commit6c0ecb6bc94c854fdcfd10986c7134aa79af693f
tree0a8fa6409a31f36ac7cb32a0051b9e15bf66e205
parent5447106aff9950d1305b1a101efe4d52f6539dcc
parented30217c423c02265ab515def36f942de5f15e2f
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658  -s ours am: 5a3998fe38  -s ours
am: ed30217c42  -s ours

Change-Id: If8d06784fb6f699ef8e0bb999d0095ee04eff392