aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-100-0/+0
|\
| * Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...Neil Fuller2015-11-100-0/+0
| |\
| | * Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...Neil Fuller2015-11-100-0/+0
| | |\
| | | * Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive b...Neil Fuller2015-11-102-1/+5
| | |/|
| | | * DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffersNeil Fuller2015-11-092-1/+5
| | |/
| * | Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""Thierry Strudel2015-11-051-1/+1
| * | Merge "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" into mnc-d...Ye Wen2015-11-041-1/+1
| |\ \
| | * | DO NOT MERGE Revert "okio: increase segment size to 8 KiB"Ye Wen2015-11-041-1/+1
* | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/ext...stable/cm-13.0-ZNH0ESteve Kondik2015-12-072-0/+18
|\ \ \ \
| * | | | Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""Thierry Strudel2015-11-091-1/+1
| * | | | DO NOT MERGE Revert "okio: increase segment size to 8 KiB"Ye Wen2015-11-041-1/+1
| |/ / /
| * | | Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()Neil Fuller2015-10-232-0/+18
* | | | okhttp: Get tcmiface off the boot classpathSteve Kondik2015-11-072-4/+6
* | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-2/+0
|\ \ \ \
| * \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-230-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | |\ \
| * | | \ \ am e0d02d71: Reduce the memory requirements of a testNeil Fuller2015-10-011-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Reduce the memory requirements of a testNeil Fuller2015-09-301-2/+2
| * | | | okio: increase segment size to 8 KiBThierry Strudel2015-09-221-1/+1
| |/ / /
| * | | am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add f...Neil Fuller2015-08-120-0/+0
| |\ \ \
| | * \ \ am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add further handli...Neil Fuller2015-08-120-0/+0
| | |\ \ \
| | | * \ \ am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT i...Neil Fuller2015-08-122-1/+48
| | | |\ \ \
| | | | * \ \ Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly re...Neil Fuller2015-08-122-1/+48
| | | | |\ \ \
| | | | | * | | Revert "Revert "Add further handling for when a CONNECT incorrectly returns a...Neil Fuller2015-08-102-1/+48
| | | | |/ / /
| * | | | / / am fe5cf4e1: am 6e829118: (-s ours) am ce55fb3f: Merge "Revert "Add further h...Neil Fuller2015-08-070-0/+0
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | am 6e829118: (-s ours) am ce55fb3f: Merge "Revert "Add further handling for w...Neil Fuller2015-08-070-0/+0
| | |\| | |
| | | * | | am ce55fb3f: Merge "Revert "Add further handling for when a CONNECT incorrect...Neil Fuller2015-08-072-48/+1
| | | |\| |
| | | | * | Merge "Revert "Add further handling for when a CONNECT incorrectly returns a ...Neil Fuller2015-08-072-48/+1
| | | | |\ \
| | | | | * \ Merge "Revert "Add further handling for when a CONNECT incorrectly returns a ...Neil Fuller2015-08-042-48/+1
| | | | | |\ \
| | | | | | * | Revert "Add further handling for when a CONNECT incorrectly returns a body."Neil Fuller2015-07-172-48/+1
| | | | | |/ /
* | | | | | | Merge tag 'android-6.0.0_r5' into cm-13.0Ricardo Cerqueira2015-11-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Reduce the memory requirements of a testNeil Fuller2015-10-011-2/+2
* | | | | | | | external/okhttp: Increase socket read bytes from 2KB to 8KBManikanta Sivapala2015-10-061-1/+3
* | | | | | | | Add TCM (TCP Connection Management) supportSusheel Yadagiri2015-10-063-5/+99
|/ / / / / / /
* | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| |\ \ \ \ \
| | * | | | | Fix for HttpURLConnection not always throwing SocketTimeoutExceptionNeil Fuller2015-06-116-15/+50
* | | | | | | Allow HttpEngine to retry connections on timeout / interruption.Narayan Kamath2015-07-302-5/+6
|/ / / / / /
* | | | | | Apply upstream changes for timeout / pooled connection issueNeil Fuller2015-06-154-10/+167
* | | | | | Fix for HttpURLConnection not always throwing SocketTimeoutExceptionNeil Fuller2015-06-116-15/+50
|/ / / / /
* | | | | Fix flaky test Spdy3ConnectionTest.receiveGoAway().jwilson2015-05-281-2/+1
* | | | | am c1897821: am 1aeac900: am b8b31e4b: Reduce flakiness of OkHttp tests autom...Neil Fuller2015-05-130-0/+0
|\| | | |
| * | | | am 1aeac900: am b8b31e4b: Reduce flakiness of OkHttp tests automerge: 81ed04aNeil Fuller2015-05-130-0/+0
| |\| | |
| | * | | am b8b31e4b: Reduce flakiness of OkHttp tests automerge: 81ed04aNeil Fuller2015-05-130-0/+0
| | |\| |
| | | * | Reduce flakiness of OkHttp testsNeil Fuller2015-05-070-0/+0
| | | |\|
* | | | | Rollup of upstream OkHttp and Okio changesNeil Fuller2015-05-0879-1566/+9931
* | | | | am 5c8574a4: am 12985b2c: am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller2015-05-060-0/+0
|\| | | |
| * | | | am 12985b2c: am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller2015-05-060-0/+0
| |\| | |
| | * | | am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller2015-05-060-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/