aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\|
| | | * Merge "Use new UnsupportedAppUsage annotation."Treehugger Robot2019-12-1121-77/+85
| | |/|
| | | * Use new UnsupportedAppUsage annotation.Artur Satayev2019-12-1021-77/+85
| | |/
* | | Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."...Pete Bentley2019-11-273-5/+100
|\| |
| * | Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."...Pete Bentley2019-11-273-5/+100
| |\|
| | * Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."Pete Bentley2019-11-273-5/+100
| | |\
| | | * Merge "Add strict mode to OkHostnameVerifier for top-level domain wildcards."Pete Bentley2019-11-273-5/+100
| | | |\
| | | | * Add strict mode to OkHostnameVerifier for top-level domain wildcards.Pete Bentley2019-11-273-5/+100
| | | |/
* | | | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
|\| | |
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| |\| |
| | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| | |\ \ | | | |/ | | |/|
* | | | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cf am: ...Paul Duffin2019-10-051-7/+4
|\| | |
| * | | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cf am: ...Paul Duffin2019-10-051-7/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Merge "Switch from conscrypt to conscrypt intra core api" am: 5bff2652cfPaul Duffin2019-10-051-7/+4
| | |\|
| | | * Merge "Switch from conscrypt to conscrypt intra core api"Paul Duffin2019-10-051-7/+4
| | | |\
| | | | * Merge "Switch from conscrypt to conscrypt intra core api"ndk-sysroot-r21Paul Duffin2019-10-051-7/+4
| | | | |\
| | | | | * Switch from conscrypt to conscrypt intra core apiPaul Duffin2019-10-021-7/+4
| | | | |/
* | | | | Merge "Remove duplicate libraries that are provided by system modules" am: c5...Paul Duffin2019-09-231-8/+4
|\| | | |
| * | | | Merge "Remove duplicate libraries that are provided by system modules" am: c5...Paul Duffin2019-09-231-8/+4
| |\| | |
| | * | | Merge "Remove duplicate libraries that are provided by system modules" am: c5...Paul Duffin2019-09-231-8/+4
| | |\| |
| | | * | Merge "Remove duplicate libraries that are provided by system modules"Paul Duffin2019-09-231-8/+4
| | | |\|
| | | | * Merge "Remove duplicate libraries that are provided by system modules"Treehugger Robot2019-09-231-8/+4
| | | | |\
| | | | | * Remove duplicate libraries that are provided by system modulesPaul Duffin2019-09-201-8/+4
| | | | |/
* | | | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aa am: 0c15df6b70 ...Pete Gillin2019-09-1613-0/+126
|\| | | |
| * | | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aa am: 0c15df6b70Pete Gillin2019-09-1613-0/+126
| |\| | |
| | * | | Merge "Add TEST_MAPPINGS for external/okhttp." am: d650f3b3aaPete Gillin2019-09-1613-0/+126
| | |\| |
| | | * | Merge "Add TEST_MAPPINGS for external/okhttp."Pete Gillin2019-09-1613-0/+126
| | | |\|
| | | | * Merge "Add TEST_MAPPINGS for external/okhttp."Pete Gillin2019-09-1613-0/+126
| | | | |\
| | | | | * Add TEST_MAPPINGS for external/okhttp.Pete Gillin2019-09-0413-0/+126
* | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\| | | |
| | * | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\| | |
| | | * | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |