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

Merge commit 'fb95298f47388589752d0daa6bded568b7898864'

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