am f54d7a2c: am a3cf93a2: (-s ours) Merge change I3ff67703 into eclair

Merge commit 'f54d7a2c924b2d1060a89ac398f57a58e3e581d1' into eclair-mr2-plus-aosp

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