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

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours am: 51fc07ad61  -s ours am: c344f9b1c7  -s ours
am: 39d480e67c  -s ours

Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2
---

59f4b0c11f905a9bc8d2d38bc3daf9540c83dd5b