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

Merge commit 'd9d4b4c5e43eeb7a2ee42e9e605f620adbb6740b' into gingerbread

* commit 'd9d4b4c5e43eeb7a2ee42e9e605f620adbb6740b':
  Check TelephonyManager#getDeviceId Returns Null