From: Eric Fischer <enf@google.com>
Date: Mon, 2 Nov 2009 05:51:36 +0000 (-0800)
Subject: am bf777ba8: (-s ours) am 2b42f028: am 8e3c8c20: (-s ours) Merge change I1d016ce3... 
X-Git-Tag: android-x86-2.2~316
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f7660bc7b3bff326b8eee9971965b19c09b3b39e;p=android-x86%2Fpackages-apps-Settings.git

am bf777ba8: (-s ours) am 2b42f028: am 8e3c8c20: (-s ours) Merge change I1d016ce3 into eclair

Merge commit 'bf777ba89ccce0f6804a3a58daff1bbc767f7071'

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

f7660bc7b3bff326b8eee9971965b19c09b3b39e