From: Baligh Uddin <baligh@google.com>
Date: Sun, 27 Sep 2015 03:10:00 +0000 (+0000)
Subject: am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1... 
X-Git-Tag: android-x86-6.0-r1~25^2~11
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Settings.git;a=commitdiff_plain;h=23adae13328e88ac38b0448a4375dcb3264839e5

am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

* commit '4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e':
  Import translations. DO NOT MERGE
---

23adae13328e88ac38b0448a4375dcb3264839e5