| commit | 9d8f9834fa91ff551521bf9bf82b59f6cf655efe | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:45:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:45:51 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7755b3697e0cc3b104c00472b128604db6457698 [diff] | |
| parent | b96f5955e617943090d0bcfe0c6b6faa56e166d1 [diff] |
am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check." * commit '3dced0d2c6000d1d77fd2ada83a9853734367cbc':