OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am...
authorBill Yi <byi@google.com>
Thu, 14 Sep 2017 00:24:48 +0000 (00:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 00:24:48 +0000 (00:24 +0000)
commit42155ee7c6bf67009d3cf4870e2276c622fb282b
treefce5834ec394f342a891acf11ae4b59001f427c5
parente62b35f758f02340e7e529569c2a2bf6b57610d7
parent5e220d0800c80ac8ad1328345ab3bcdb8f3ac294
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee  -s ours am: 289d6b71a9  -s ours am: 74e9007c7b  -s ours
am: 5e220d0800  -s ours

Change-Id: I95f4b0ca227e69e524c7550e0255688ab038c916