Merge change Ia98fd30d into eclair

* changes:
  Restore missing string that was still referenced from code.
tree: 47660a822dcaa22271978d9fdc3874cc89237fe2
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE