Merge change 24215 into eclair

* changes:
  Temporary fix for bug 2102395: guard against bad contact url.
tree: 100929f52aabd711b06c062c51c799dccb768d5e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE