| commit | 0edb0d2e7188d655c2894ddcf48d53378e437f42 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:59 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3234255c953cf91b9e046fda1a90b6ad14a7a55a [diff] | |
| parent | 9d8f9834fa91ff551521bf9bf82b59f6cf655efe [diff] |
am 51e69ca1: am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check." * commit '51e69ca12461433912b295d6a3fc09361369489b':