Commit 6873bf0f authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo 

* commit '3f36806c':
  Fix android.net.cts.ProxyTest
parents 69c69f15 3f36806c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment