aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-02-11merge in lmp-mr1-nova-release history after reset to lmp-mr1-devandroid-5.1.1_r8android-5.1.1_r7android-5.1.1_r29android-5.1.1_r23android-5.1.1_r18android-5.1.1_r13lollipop-mr1-fi-releaseThe Android Automerger
2015-02-10merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-5.1.1_r9android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaseThe Android Automerger
2015-02-09Reduce flakiness of OkHttp testsandroid-cts-5.1_r1android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devNeil Fuller
2015-01-07merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-02merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-02merge in lmp-mr1-nova-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-22merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-11Fix DisconnectTest for devices with large socket buffersNeil Fuller
2014-12-10Avoid a reverse DNS-lookup for a numeric proxy addressNeil Fuller
2014-12-10Merge "Avoid a reverse DNS-lookup for a numeric proxy address" into lmp-mr1-devNeil Fuller
2014-12-09Avoid a reverse DNS-lookup for a numeric proxy addressNeil Fuller
2014-12-03merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-02am 0f102f51: Add further handling for when a CONNECT incorrectly returns a body.Neil Fuller
2014-12-02Add further handling for when a CONNECT incorrectly returns a body.Neil Fuller
2014-12-02merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-01Fixes to ConnectionPool noticed during upstream reviewNeil Fuller
2014-11-21am 466ef072: am db7edbf1: am 200d28a2: am e82a7960: Fix a bug in OkHostnameVe...Alex Klyubin
2014-11-20merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-20Merge "Fix for a socket leak in OkHttp on Android" into lmp-mr1-devNeil Fuller
2014-11-20Fix for a socket leak in OkHttp on AndroidNeil Fuller
2014-11-19am db7edbf1: am 200d28a2: am e82a7960: Fix a bug in OkHostnameVerifier wildca...Alex Klyubin
2014-11-19am 200d28a2: am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.Alex Klyubin
2014-11-19am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.Alex Klyubin
2014-11-19Fix a bug in OkHostnameVerifier wildcard handling.android-cts-4.4_r4kitkat-cts-releasekitkat-cts-devAlex Klyubin
2014-11-18Fix a bug in OkHostnameVerifier wildcard handling.Alex Klyubin
2014-11-08merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-06merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-05merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-04merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-03merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-02merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-11-01merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-10-30merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-10-29merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger
2014-10-28merge in lmp-mr1-release history after reset to 8cdfc1007818eec034fd6f547425c...The Android Automerger
2014-10-28Be consistent about host names in RouteSelector.Narayan Kamath
2014-10-27merge in lmp-mr1-release history after reset to 602d5e4cfdbd0bad91e7872837f95...The Android Automerger
2014-10-27Fixing SNI, ALPN, NPN support for some casesNeil Fuller
2014-10-27New disconnect strategy.Jesse Wilson
2014-10-26merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-25merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-23merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-22merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-21merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-20merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-19merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-18merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-16merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-15merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger
2014-10-14am 3c0f4a28: (-s ours) Revert "DO NOT MERGE Fixing broken OkHttp CTS test"lollipop-devKevin Ma