Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo
tree: 3195f4f6eaf84495b7ed8b2c498b937f15eee6fa
  1. tests/