am 9780f18f: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo

* commit '9780f18fc4b464deade657a4ebc2c797f4c11713':
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices