aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Expand the visibility of the OkHttp build module" am: c7003d30ef am: 8...HEADmasterTreehugger Robot2020-06-301-0/+1
|\
| * Merge "Expand the visibility of the OkHttp build module" am: c7003d30efTreehugger Robot2020-06-301-0/+1
| |\
| | * Merge "Expand the visibility of the OkHttp build module"android-r-beta-3android-r-beta-2Treehugger Robot2020-06-301-0/+1
| | |\
| | | * Expand the visibility of the OkHttp build moduleHadrien Zalek2020-06-291-0/+1
| | |/
* | | Merge "Compile okhttp for host" am: 3c53437088 am: 669a6cce22Colin Cross2020-06-272-14/+78
|\| |
| * | Merge "Compile okhttp for host" am: 3c53437088Colin Cross2020-06-272-14/+78
| |\|
| | * Merge "Compile okhttp for host"Colin Cross2020-06-272-14/+78
| |/|
| | * Compile okhttp for hostColin Cross2020-06-262-14/+78
| |/
* | Merge "Add METADATA to okhttp: Apache2=NOTICE" am: 6ea3138c1a am: 8c15cd2eaaTreehugger Robot2020-04-291-0/+3
|\|
| * Merge "Add METADATA to okhttp: Apache2=NOTICE" am: 6ea3138c1aTreehugger Robot2020-04-291-0/+3
| |\
| | * Merge "Add METADATA to okhttp: Apache2=NOTICE"Treehugger Robot2020-04-291-0/+3
| | |\
| | | * Add METADATA to okhttp: Apache2=NOTICEBob Badour2020-04-281-0/+3
| | |/
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
|\| |
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \
| | * \ Merge "Depend on conscrypt.module.intra.core.api not stubs" am: 91e010bb68 am...Treehugger Robot2020-04-091-3/+3
| | |\ \ | | |/ / | |/| |
| | * | Merge "Remove testdex version." am: 513ff62d6d am: 62aa8133a1Nicolas Geoffray2020-04-031-23/+0
| | |\ \
| | * \ \ Merge "OWNERS: tobiast -> ngeoffray." am: e5a5672642 am: 64bd80e5ecTobias Thierer2020-03-271-1/+1
| | |\ \ \
| | * \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ \ \ \
* | | | | | | Merge "Depend on conscrypt.module.intra.core.api not stubs" am: 91e010bb68 am...Treehugger Robot2020-04-091-3/+3
|\| | | | | |
| * | | | | | Merge "Depend on conscrypt.module.intra.core.api not stubs" am: 91e010bb68Treehugger Robot2020-04-091-3/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Merge "Depend on conscrypt.module.intra.core.api not stubs"Treehugger Robot2020-04-091-3/+3
| | |\ \ \ \
| | | * | | | Depend on conscrypt.module.intra.core.api not stubsPaul Duffin2020-04-081-3/+3
| | |/ / / /
* | | | | | Merge "Remove testdex version." am: 513ff62d6d am: 62aa8133a1Nicolas Geoffray2020-04-031-23/+0
|\| | | | |
| * | | | | Merge "Remove testdex version." am: 513ff62d6dNicolas Geoffray2020-04-031-23/+0
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Merge "Remove testdex version."Nicolas Geoffray2020-04-031-23/+0
| | |\ \ \
| | | * | | Remove testdex version.Nicolas Geoffray2020-04-031-23/+0
| | |/ / /
* | | | | Merge "OWNERS: tobiast -> ngeoffray." am: e5a5672642 am: 64bd80e5ecTobias Thierer2020-03-271-1/+1
|\| | | |
| * | | | Merge "OWNERS: tobiast -> ngeoffray." am: e5a5672642Tobias Thierer2020-03-271-1/+1
| |\| | | | | |_|/ | |/| |
| | * | Merge "OWNERS: tobiast -> ngeoffray."Tobias Thierer2020-03-271-1/+1
| | |\ \
| | | * | OWNERS: tobiast -> ngeoffray.Tobias Thierer2020-03-251-1/+1
| | |/ /
* | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
|\| | |
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
* | | Merge "Make okhttp-nojarjar visible to art sdk" am: 781dda91ba am: 7ade36b9f2...android-mainline-11.0.0_r1android11-tests-releaseandroid11-tests-devandroid11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-191-0/+1
|\ \ \ | | |/ | |/|
| * | Merge "Make okhttp-nojarjar visible to art sdk" am: 781dda91ba am: 7ade36b9f2Automerger Merge Worker2020-01-191-0/+1
| |\|
| | * Merge "Make okhttp-nojarjar visible to art sdk"android-r-preview-4android-r-preview-3android-r-preview-2Paul Duffin2020-01-191-0/+1
| |/|
| | * Merge "Make okhttp-nojarjar visible to art sdk"android-r-preview-1Treehugger Robot2020-01-191-0/+1
| | |\
| | | * Make okhttp-nojarjar visible to art sdkPaul Duffin2020-01-171-0/+1
| | |/
* | | Merge "Set apex_available for okhttp" am: 518242f5e6 am: ecf245153bAnton Hansson2020-01-101-0/+4
|\| |
| * | Merge "Set apex_available for okhttp" am: 518242f5e6 am: ecf245153bAutomerger Merge Worker2020-01-101-0/+4
| |\ \
| | * | Merge "Set apex_available for okhttp"Anton Hansson2020-01-101-0/+4
| | |\|
| | | * Merge "Set apex_available for okhttp"Anton Hansson2020-01-101-0/+4
| | | |\
| | | | * Set apex_available for okhttpAnton Hansson2020-01-101-0/+4
| | | |/
* | | | Merge "Create strict instances of OKHostnameVerifier on demand." am: 08538423...Automerger Merge Worker2020-01-093-9/+15
|\| | |
| * | | Merge "Create strict instances of OKHostnameVerifier on demand." am: 08538423...Automerger Merge Worker2020-01-093-9/+15
| |\| |
| | * | Merge "Create strict instances of OKHostnameVerifier on demand."Pete Bentley2020-01-093-9/+15
| | |\|
| | | * Merge "Create strict instances of OKHostnameVerifier on demand."Pete Bentley2020-01-093-9/+15
| | | |\
| | | | * Create strict instances of OKHostnameVerifier on demand.Pete Bentley2020-01-073-9/+15
| | | |/
* | | | Merge "Use new UnsupportedAppUsage annotation." am: 0db3af9fb3 am: d45c94d001...Automerger Merge Worker2019-12-1121-77/+85
|\| | |
| * | | Merge "Use new UnsupportedAppUsage annotation." am: 0db3af9fb3 am: d45c94d001Automerger Merge Worker2019-12-1121-77/+85
| |\| |
| | * | Merge "Use new UnsupportedAppUsage annotation."Artur Satayev2019-12-1121-77/+85
| | |\|