From: Baligh Uddin <baligh@google.com>
Date: Thu, 17 Oct 2013 21:33:37 +0000 (-0700)
Subject: am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~2114^2~127
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9e80ada;p=android-x86%2Fpackages-apps-Settings.git

am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE

* commit '3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
  Import translations. DO NOT MERGE
---

e9e80ada85bb124df6b9ede805a349e345a84bb3