| commit | 7cedc11904eec6366e3f44b594649b0cfc3e8eba | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jul 25 03:26:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 03:26:15 2015 +0000 |
| tree | 6c05be7799e35c2ad5fa291a37f7a87eaaca0afa | |
| parent | c93e4352b56606ce0a5594205242d9ab42633c55 [diff] | |
| parent | 80b2a631443da7682434549ebd9e862d302906bb [diff] |
am 3bbe09a8: am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check." * commit '3bbe09a8c63b2667307a7790419d33647045777f': Fix socket_network_client_timeout error check.