tree c4f12fc6371dd08adbfcc1903808d2aa66732142
parent 389583cd0cb88712a3e3c4c32a994ce3d734ddc4
parent 374fd5a148213dd269a54ea9e1745a3b95b6d933
author Yong Zhang <yzhang@motorola.com> 1253578781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253578781 -0700

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