From: Bill Yi <byi@google.com>
Date: Thu, 30 Nov 2017 23:01:17 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master
X-Git-Tag: android-x86-9.0-r1~93^2~1^2~46
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9bbae65730;p=android-x86%2Fpackages-apps-Settings.git

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

Change-Id: I8979949845d4722a448047f31beb6fa11ff60434
---

9bbae65730e12970591bda5e432079ea1dfa7368