From: Eric Fischer <enf@google.com>
Date: Mon, 7 Mar 2011 21:24:39 +0000 (-0800)
Subject: am bada0585: (-s ours) am 0e1acd4d: Merge "Import revised translations.  DO NOT MERGE... 
X-Git-Tag: android-x86-4.4-r1~2522
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f3b5a4620afd99aa6dd130fff338f5a68f8d90b3;p=android-x86%2Fpackages-apps-Settings.git

am bada0585: (-s ours) am 0e1acd4d: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit 'bada05855b26e9e9309460d22e2a48177ecaacd9':
  Import revised translations.  DO NOT MERGE
---

f3b5a4620afd99aa6dd130fff338f5a68f8d90b3