From: Ying Wang <wangying@google.com>
Date: Wed, 1 Aug 2012 22:34:00 +0000 (-0700)
Subject: am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
X-Git-Tag: android-x86-4.4-r1~634^2~476
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c0ad89c;p=android-x86%2Fpackages-apps-Settings.git

am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE

* commit '6a20ce5e515141b0934bd4093dbad53c14a19a6e':
  Import translations. DO NOT MERGE
---

4c0ad89c169af0d2841de1924c5fe1dd6931e6a0