From: Bill Yi <byi@google.com>
Date: Thu, 20 Jul 2017 21:47:30 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8  -s ours... 
X-Git-Tag: android-x86-9.0-r1~374
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79c6f7a15652fed8357d805cddb7822cddd22087;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8  -s ours am: 2d50ad831e  -s ours
am: 14ebe7a75d  -s ours

Change-Id: Ia4cba51e8f08c5ff7e84756a4b920182835c2640
---

79c6f7a15652fed8357d805cddb7822cddd22087