am 3f98f3dc: Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo

Merge commit '3f98f3dcad07d367389517812366d20593e658fc' into froyo

* commit '3f98f3dcad07d367389517812366d20593e658fc':
  Check TelephonyManager#getDeviceId Returns Null