am bce66392: (-s ours) am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair

Merge commit 'bce66392fe728780bc203657f21e65ad53c097bb'

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