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

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

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc
---

c53fb015d9292e034f50a2b1e15d5eda62b8c35c