am 374fd5a1: am 6e81a40d: Merge change 26286 into eclair

Merge commit '374fd5a148213dd269a54ea9e1745a3b95b6d933'

* commit '374fd5a148213dd269a54ea9e1745a3b95b6d933':
  Resolve race conditions with disconnect of CDMA data and airplane mode