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

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

Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b
---

0911a97fc276f074fdbe8747f054ed9a77d02c99