am 51e69ca1: am 3dced0d2: (-s ours) am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."

* commit '51e69ca12461433912b295d6a3fc09361369489b':
This commit is contained in:
Elliott Hughes 2015-08-27 14:28:59 +00:00 committed by Android Git Automerger
commit 81ef764b3b

Diff content is not available