am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair

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

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