aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2cm-14.1Dan Pasanen2017-04-050-0/+0
|\
| * Apply upstream commit: Allow HTAB in header values.Tobias Thierer2016-09-123-3/+14
| |\
| * \ Use different URL encoding for single quote in queryNeil Fuller2016-09-082-3/+10
| |\ \
* | | | okhttp: Get tcmiface off the boot classpathstaging/cm-14.1-cafrebasecm-14.1_oldSteve Kondik2017-01-012-4/+6
* | | | Merge 8a8118d2f1a16710729efe1d509a3156b55efa6d on remote branchLinux Build Service Account2016-12-155-6/+24
|\ \ \ \
| * | | | Merge N-MR1 to remote branch.Lalit Kansara2016-12-085-6/+24
|/| | | | | | |_|/ | |/| |
| * | | Apply upstream commit: Allow HTAB in header values.Tobias Thierer2016-09-123-3/+14
| | |/ | |/|
| * | Use different URL encoding for single quote in queryNeil Fuller2016-08-102-3/+10
| |/
| * Fix regression in the HTTP request lineNeil Fuller2016-07-130-0/+0
| |\
| | * Fix regression in the HTTP request lineNeil Fuller2016-07-134-18/+199
| * | Fix regression in the HTTP request lineNeil Fuller2016-07-134-18/+199
| * | Relax validation of HTTP header values to retain L/M behaviorNeil Fuller2016-05-263-8/+19
| |\|
| * | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f...Daniel Xie2016-04-270-0/+0
| |\ \
| * \ \ Modify tests with parameters to work with CTSNicholas Sauer2016-04-183-3/+15
| |\ \ \
* | | | | ok-http: Listening to the redirect URLManjunatha Prabhu2016-08-242-2/+130
* | | | | Add TCM (TCP Connection Management) supportSharat Masetty2016-08-243-5/+100
* | | | | Fix regression in the HTTP request lineNeil Fuller2016-07-134-18/+199
* | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-290-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-190-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-150-0/+0
| | | |\ \
| | | | * \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-100-0/+0
| | | | |\ \
| | | | | * \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-180-0/+0
| | | | | |\ \
| | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | |\ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | |\| |
| | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-01-210-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2016-01-170-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2015-12-100-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2015-12-030-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in nyc-release history after reset to masterThe Android Automerger2015-11-240-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak2015-11-231-1/+1
| | | | | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | |\ \
* | | | | | | | | | | | | | | Relax validation of HTTP header values to retain L/M behaviorNeil Fuller2016-05-253-8/+19
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f...Takeshi Katae2016-04-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f...Daniel Xie2016-04-261-11/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5f...Takeshi Katae2016-04-261-11/+19
| |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-dev am: 8284e5fDaniel Xie2016-04-261-11/+19
| |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-devTakeshi Katae2016-04-261-11/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix a race closing MockSpdyPeer." into marshmallow-cts-devDaniel Xie2016-04-261-11/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix a race closing MockSpdyPeer.Takeshi Katae2016-04-131-11/+19
| | | |/ / / / / / / / / / / / /
* | | | / / / / / / / / / / / / Modify tests with parameters to work with CTSNicholas Sauer2016-04-173-3/+15
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Reapply an upstream OkHttp change to Android for HttpUrlNeil Fuller2016-03-163-69/+115
* | | | | | | | | | | | | | | Reapply an upstream OkHttp change to Android for HttpUrlNeil Fuller2016-03-165-41/+95
* | | | | | | | | | | | | | | Apply upstream OkHttp HttpUrl fixjwilson2016-03-164-53/+177
* | | | | | | | | | | | | | | Apply upstream OkHttp HttpUrl fixjwilson2016-03-162-4/+26
* | | | | | | | | | | | | | | Apply upstream OkHttp HttpUrl fixIsaac Green2016-03-163-13/+19
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | okhttp: add workaround in RequestTest for \rSergio Giro2016-03-141-2/+2
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Workaround for request header values with trailing '\r' or '\r\n'Sergio Giro2016-03-092-4/+11
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Temporary workaround for whatsapp issues.Narayan Kamath2016-02-178-16/+29