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

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours am: 0a1948e515  -s ours am: 7cb6513f6d  -s ours am: f0687d1201  -s ours am: 9c166446fd  -s ours
am: a1834cfc3f  -s ours

Change-Id: Ia65be7aaf7fdf86151eb0ace6e2cb3400a0b73c2
---

5c72a77bcaed8f399974f4edbf3d156a0ceb7cbb