From: Baligh Uddin <baligh@google.com>
Date: Thu, 13 Mar 2014 18:08:56 +0000 (+0000)
Subject: am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7... 
X-Git-Tag: android-x86-6.0-r1~2646^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4323f74aa197701b7b1ea8c45993f57563208810;p=android-x86%2Fpackages-apps-Settings.git

am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5969801cc119ce58c7f18b1a9cbcc46c8b7ad232':
  Import translations. DO NOT MERGE
---

4323f74aa197701b7b1ea8c45993f57563208810