Merge "Fix android.net.cts.ProxyTest" into froyo
tree: cef2db9c435d108a034576618c2e6681176634b6
  1. tests/