From: Bill Yi <byi@google.com>
Date: Thu, 21 Dec 2017 20:34:39 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am... 
X-Git-Tag: android-x86-9.0-r1~284^2~55
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d65ebd285f2a127d5312e6e7b32fb46f51c9b46;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours am: bd14c44fd8  -s ours am: f6c335b353  -s ours am: f24783846d  -s ours
am: 29f70cb6fb  -s ours

Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
---

4d65ebd285f2a127d5312e6e7b32fb46f51c9b46