| commit | 6873bf0fd29a0537ba8e44459a0674fb77e9029d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Nov 29 14:04:12 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 29 14:04:12 2010 -0800 |
| tree | 8cd80b2503f32a98e2e3f2785d0a31bd412a5c46 | |
| parent | 69c69f156bebe834cfbb13eb7f93dc9e25ee723b [diff] | |
| parent | 3f36806c4a1790381402017835b1f40a32b91fb7 [diff] |
am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '3f36806c4a1790381402017835b1f40a32b91fb7': Fix android.net.cts.ProxyTest