am ed10d655: Merge change Ia98fd30d into eclair

Merge commit 'ed10d65582fda0d78bb9707f71bc56a0387d735f' into eclair-mr2

* commit 'ed10d65582fda0d78bb9707f71bc56a0387d735f':
  Restore missing string that was still referenced from code.
tree: 3305d62334a47eb27ec7361ea58e8d392788bf1c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE