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

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