From: Baligh Uddin <baligh@google.com>
Date: Thu, 5 Dec 2013 21:30:10 +0000 (+0000)
Subject: am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~2837^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8568ad2d;p=android-x86%2Fpackages-apps-Settings.git

am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE

* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
---

8568ad2d7023193b7125ac16d7f78c8556c652bf