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
This commit is contained in:
Brian Muramatsu
2011-01-19 18:29:32 -08:00
committed by Android Git Automerger

Diff Content Not Available