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