From: Baligh Uddin <baligh@google.com>
Date: Tue, 15 Oct 2013 02:01:01 +0000 (-0700)
Subject: am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~2114^2~133
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=81d0f1b9;p=android-x86%2Fpackages-apps-Settings.git

am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE

* commit '9f9a9652099204c2e15f1c1660e6886162932943':
  Import translations. DO NOT MERGE
---

81d0f1b93c9e1be59546a5efa875202378efacbe