| commit | 358cf19274152c777f54f3972f0be7e5c908fcac | [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 | edb06045882ba5642a5640780ee8ae853c3b0736 | |
| parent | c11e42329b75677161165aa025ac636866b127a1 [diff] | |
| parent | 91d0b1ea9bf26f2a728fe6fef75b6e2f695de4f4 [diff] |
am 6873bf0f: am 91d0b1ea: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '6873bf0fd29a0537ba8e44459a0674fb77e9029d': Fix android.net.cts.ProxyTest