From: Eric Fischer <enf@google.com>
Date: Sat, 29 Jan 2011 16:02:19 +0000 (-0800)
Subject: am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations.  DO NOT MERGE... 
X-Git-Tag: android-x86-4.4-r1~8504^2~396
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5027c29088c23db0b0b6cfe11593947785e2b8ee;p=android-x86%2Fframeworks-native.git

am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

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

5027c29088c23db0b0b6cfe11593947785e2b8ee