From: Eric Fischer <enf@google.com>
Date: Tue, 19 Jun 2012 23:23:23 +0000 (-0700)
Subject: Merge "Import translations. DO NOT MERGE" into jb-dev
X-Git-Tag: android-x86-4.4-r1~1275^2~5^3~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f4a4119e;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into jb-dev
---

f4a4119eeaed1a99c082f253174b8acbca07c4c2