| commit | 1a91065ed6dbd0a3c66d5a7cb22766c81fdde628 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Nov 29 14:06:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 29 14:06:01 2010 -0800 |
| tree | 85ee2935d6ab138b67875307840d22631bd383d0 | |
| parent | cd5541736ae9bebda79d8b647d1fc2d8e20aa1db [diff] | |
| parent | 6873bf0fd29a0537ba8e44459a0674fb77e9029d [diff] |
am 6873bf0f: am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '6873bf0fd29a0537ba8e44459a0674fb77e9029d': Fix android.net.cts.ProxyTest