am 290596e5: am a388561b: Merge change 24215 into eclair

Merge commit '290596e5bf96c416adff5d54df0a10d432bac521'

* commit '290596e5bf96c416adff5d54df0a10d432bac521':
  Temporary fix for bug 2102395: guard against bad contact url.
tree: 07927c6eb12661d161825154418d89c945e46dce
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE