| commit | 819de68b01ec9f8d44e4fa1e16bf4900abf90b16 | [log] [tgz] |
|---|---|---|
| author | Marc Blank <mblank@google.com> | Fri Apr 23 12:45:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 23 12:45:55 2010 -0700 |
| tree | 615c4484b81d32cf87404525c5ebb2b14a3e9f10 | |
| parent | 2ca8d7347db3975746ad87347de57fd5800bf5d4 [diff] | |
| parent | de3ae17246bc011eff61e18ee1013e146ec53a3d [diff] |
am de3ae172: Merge "Add additional test for likely NAT timeout" into froyo Merge commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d' into froyo-plus-aosp * commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d': Add additional test for likely NAT timeout