commit | b34da8f07998d40c0377d08da21166eb56203de2 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Jul 25 02:13:39 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 02:13:39 2015 +0000 |
tree | 5c5b1fae54f1babb47851dd1648eebd29dbd4a93 | |
parent | f9c65dea726cacea7845d95afc4a9b1d3708f9b2 [diff] | |
parent | 1a9e93b05bfc2c40eba690b613abe509a2d63d9c [diff] |
am ed217967: Merge "Fix socket_network_client_timeout error check." * commit 'ed21796754c4879bedaa1a479ae288dda6dad478': Fix socket_network_client_timeout error check.