tree 477c8e6159c01117005d1c05381750a8a6e61146
parent a5b6ba33c17331a18f9bc44a937702498fc268ad
author Neil Fuller <nfuller@google.com> 1432720224 +0100
committer Neil Fuller <nfuller@google.com> 1434024757 +0100

Fix for HttpURLConnection not always throwing SocketTimeoutException

Contains upstream changes:
Okio: https://github.com/square/okio/pull/154
OkHttp: https://github.com/square/okhttp/pull/1698 (pending)

Bug: 21396523
Change-Id: Ibe913cb8584331a470716272dcd42c088cbb975e