am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo

Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp

* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
  Dont start wifi if in airplane mode

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base