From: Bill Yi <byi@google.com>
Date: Thu, 29 Sep 2016 08:07:04 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours... 
X-Git-Tag: android-x86-8.1-r1~1585
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=be08ed16e9e42012ca6e06529da56379d752bde3;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours am: c53fb015d9  -s ours
am: 1ed1b99ad0  -s ours

Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed
---

be08ed16e9e42012ca6e06529da56379d752bde3