am b847f5c6: (-s ours) Merge change I3a308bca into eclair

Merge commit 'b847f5c644cfa4923b13a8a25252ccfe91c378c5' into eclair-mr2

* commit 'b847f5c644cfa4923b13a8a25252ccfe91c378c5':
  Import revised translations.  DO NOT MERGE
tree: 79388ee066788a16535f61b7fc9e380fe98c87e5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE