From: Bill Yi <byi@google.com>
Date: Thu, 30 Nov 2017 22:49:12 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master
X-Git-Tag: android-x86-9.0-r1~309^2^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=54a7cba93448ba2f8f809d8883706a1b390be2aa;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4f9f278341  -s ours

Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7
---

54a7cba93448ba2f8f809d8883706a1b390be2aa