From: Bill Yi <byi@google.com>
Date: Thu, 1 Sep 2016 06:45:28 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~233
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3e3da9b35b70a0c0e3c239c9c5c6caa7772724ad;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6030f64a58  -s ours

Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9
---

3e3da9b35b70a0c0e3c239c9c5c6caa7772724ad