| commit | a0490ab85c2bba2864d1aab9547bc471c38d78c5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Aug 15 01:42:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 15 01:42:28 2013 -0700 |
| tree | 5828d41ac0d9993a1037b0ee8aeb99bd00cb31f3 | |
| parent | 075ff6c88f52c984712355843fc072ab113aab74 [diff] | |
| parent | 3291a3a1b8e9331d85985c630189a10db9bee279 [diff] |
am 3291a3a1: am 45b98832: Merge "Fix URLConnectionTest#testConnectTimeouts." * commit '3291a3a1b8e9331d85985c630189a10db9bee279': Fix URLConnectionTest#testConnectTimeouts.