am 98fa50f3: Merge change 25612 into eclair
am 98fa50f3: Merge change 25612 into eclair

Merge commit '98fa50f3668c9339e5d716d026f4595cc3dd4fac' into eclair-plus-aosp

* commit '98fa50f3668c9339e5d716d026f4595cc3dd4fac':
  use phone number if no contact id

bmaupin/android-sms-plus