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

* commit 'ec004f1d40ddfd829584d596d91eef4d2db78db2':
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
tree: 6c415014ee61dc2dab62998d96050b13bfc4f0a4
  1. tests/