summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge "Snap for 11541002 from da399151cc17b2ba06e07f0bc07c07405633a3b9 to ↵platform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
2024-03-07Snap for 11541002 from da399151cc17b2ba06e07f0bc07c07405633a3b9 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ic65947ddbf56c024537afeed133c232e3555e4bc
2024-01-24Merge "Snap for 11349503 from c166acd5b2487a6be17d9e92b27ab35d780cd6b5 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2024-01-24Snap for 11349503 from c166acd5b2487a6be17d9e92b27ab35d780cd6b5 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8262aee8fc7cff94564be7eaed5068eff15aec90
2024-01-18Merge "Make the system-current.txt available for use by /vendor tests" into ↵HEADmastermainTreehugger Robot
main am: c166acd5b2 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2912714 Change-Id: I0b2fc534e39e80597c2ee988ac5af703db19a96a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18Merge "Make the system-current.txt available for use by /vendor tests" into mainTreehugger Robot
2024-01-17Make the system-current.txt available for use by /vendor testsNelson Li
Bug: 312324146 Test: Add apache-http-legacy-system-current.txt to the Android.bp Change-Id: I343af1bd9b20da2000cf5fcfef8beef40db7dd58
2023-12-13Merge "Snap for 11211409 from 98d79fb0bbbda143b50c0f064d827e7ae891e9dc to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from 98d79fb0bbbda143b50c0f064d827e7ae891e9dc to sdk-releaseAndroid Build Coastguard Worker
Change-Id: If1409d8be94a1086a6567cdc8a2005d7e3cc42b8
2023-10-17Merge "Snap for 10964793 from ea1cd97bae6827bfa9d5733d9f2e55fde634f964 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-17Snap for 10964793 from ea1cd97bae6827bfa9d5733d9f2e55fde634f964 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I73c6c480b6c8be6aa3de76fff8fccdbbf1d1af14
2023-10-13[automerger skipped] Add additional overriding methods to signature files ↵Jihoon Kang
am: f272e21eb9 -s ours am skip reason: Merged-In I301ec87464be4fa89380b2ccb8b8b305676ec67f with SHA-1 6131efddce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/25034606 Change-Id: I408782de0f256ef8267c336641c0da2c6093902e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Add additional overriding methods to signature filesJihoon Kang
This change adds overriding methods that are essential to compile the stubs generated from the signature files. More information and the background for this change is available at go/add-overriding-one-pager. Test: m checkbuild --build-from-text-stub Bug: 299366704 (cherry picked from https://android-review.googlesource.com/q/commit:6131efddce0957c0240b9bf4331e021540a3ac4a) Merged-In: I301ec87464be4fa89380b2ccb8b8b305676ec67f Change-Id: I301ec87464be4fa89380b2ccb8b8b305676ec67f
2023-10-12[automerger skipped] Prepare for keeping concrete overrides of abstract ↵Paul Duffin
methods am: 827b162acb -s ours am skip reason: Merged-In Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d with SHA-1 837aa6961b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/25029506 Change-Id: Ib32c943c4c349f65a6589ff439d163fb48cedb93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into main am: ↵Paul Duffin
ea1cd97bae am: f9ac939eff am: ad549fec34 am: d36200aded am: 98d79fb0bb Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259 Change-Id: I69bcbc26fb0759d9d1c1f81d2ab5e5979bb47246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into main am: ↵Paul Duffin
ea1cd97bae am: f9ac939eff am: ad549fec34 am: d36200aded Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259 Change-Id: Ifef7092644b8f4d36b389ab5dc0935b06aaf2f47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into main am: ↵Paul Duffin
ea1cd97bae am: f9ac939eff am: ad549fec34 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259 Change-Id: I5f2af7ee8a4bf3637f425d616d4995310b4c7e09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into main am: ↵Paul Duffin
ea1cd97bae am: f9ac939eff Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259 Change-Id: I9061d4e5f2b983c12b6616b4d58e015d915527d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into main am: ↵Paul Duffin
ea1cd97bae Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2784259 Change-Id: I8b4cc98a416d0a7dffd76ec39a616660ac89591f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge "Add additional overriding methods to signature files" into mainPaul Duffin
2023-10-12Prepare for keeping concrete overrides of abstract methodsPaul Duffin
Currently, metalava will discard concrete overrides of abstract methods from the API signature files which causes problems when attempting to generate stubs from those files and also discards information that may be important in API reviews. This change is the first step in the process of changing that behavior. This change hard codes the current behavior for discarding the concrete overrides (`add-additional-overrides=no`) into those signature files that will (or are likely) to be affected by the change in behavior. That allows the default behavior to be changed for all the other files without affecting these. Follow up changes will remove the hard coding from the signature files and will update the contents which will include the concrete overrides of the abstract methods. More information and the background for this change is available at go/add-overriding-one-pager. Test: m checkapi Bug: 299366704 (cherry picked from https://android-review.googlesource.com/q/commit:837aa6961b503df199734b8928ad1d913dc94a5b) Merged-In: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d Change-Id: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d
2023-10-12Add additional overriding methods to signature filesJihoon Kang
This change adds overriding methods that are essential to compile the stubs generated from the signature files. More information and the background for this change is available at go/add-overriding-one-pager. Test: m checkbuild --build-from-text-stub Bug: 299366704 Change-Id: I301ec87464be4fa89380b2ccb8b8b305676ec67f
2023-10-12Merge "Snap for 10937323 from dde1797b4add8591f327259e5e4f5bee061d7639 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-12Snap for 10937323 from dde1797b4add8591f327259e5e4f5bee061d7639 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: If45e694bc486e1e0bf227e5cb5287b166310f36f
2023-10-12Merge "Prepare for keeping concrete overrides of abstract methods" into main ↵Jihoon Kang
am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6 am: 4c9cc198f0 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068 Change-Id: Id04db5d4064b87c1573aecf4bbb08ac4a54ae3e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Prepare for keeping concrete overrides of abstract methods" into main ↵Jihoon Kang
am: dde1797b4a am: e49ecec3de am: 886f90f3f2 am: cdcabb3dc6 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068 Change-Id: I270015864b7fa5c5982cbe8c4af0c15df2ec327f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Prepare for keeping concrete overrides of abstract methods" into main ↵Jihoon Kang
am: dde1797b4a am: e49ecec3de am: 886f90f3f2 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068 Change-Id: Id4ce24c3e8aea8bb0a5f2545162de910283f161d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Prepare for keeping concrete overrides of abstract methods" into main ↵Jihoon Kang
am: dde1797b4a am: e49ecec3de Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068 Change-Id: I0e5de178088b9f3b06dddd40fc6a31b3428bec6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Prepare for keeping concrete overrides of abstract methods" into main ↵Jihoon Kang
am: dde1797b4a Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/2781068 Change-Id: I24176820ad8d58251c589c6baafe1674f70ba458 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Prepare for keeping concrete overrides of abstract methods" into mainJihoon Kang
2023-10-10Prepare for keeping concrete overrides of abstract methodsPaul Duffin
Currently, metalava will discard concrete overrides of abstract methods from the API signature files which causes problems when attempting to generate stubs from those files and also discards information that may be important in API reviews. This change is the first step in the process of changing that behavior. This change hard codes the current behavior for discarding the concrete overrides (`add-additional-overrides=no`) into those signature files that will (or are likely) to be affected by the change in behavior. That allows the default behavior to be changed for all the other files without affecting these. Follow up changes will remove the hard coding from the signature files and will update the contents which will include the concrete overrides of the abstract methods. More information and the background for this change is available at go/add-overriding-one-pager. Test: m checkapi Bug: 299366704 Change-Id: Ia4e7977ae8cfefa15612b45dca33fd6007c27e5d
2022-08-16Merge "Snap for 8952093 from 0bbd5408982f09c7e290a4aa528e1bb992ddca73 to ↵platform-tools-34.0.5platform-tools-34.0.4platform-tools-34.0.3platform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4platform-tools-33.0.3Android Build Coastguard Worker
sdk-release" into sdk-release
2022-08-16Snap for 8952093 from 0bbd5408982f09c7e290a4aa528e1bb992ddca73 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ic5618a9c8feb85ae20257a825caf07b902f2f7f2
2022-05-08Merge "Snap for 8554636 from 2d8e5e0ab8954d9bbfae4b437e4513e21aad5103 to ↵platform-tools-33.0.2Android Build Coastguard Worker
sdk-release" into sdk-release
2022-05-08Snap for 8554636 from 2d8e5e0ab8954d9bbfae4b437e4513e21aad5103 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ib06ed483b0cb6fd402fe7573e8ee5a0fe8b66bef
2021-10-07Merge "Snap for 7800789 from 8ffaef845cd55a083c120a5599234ceb25ebfe18 to ↵platform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0Android Build Coastguard Worker
sdk-release" into sdk-release
2021-10-07Snap for 7800789 from 8ffaef845cd55a083c120a5599234ceb25ebfe18 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I9bf0080934bf86ce95aae9bbeef0466d26a21ec7
2021-06-24Merge "Snap for 7487883 from 5e29f9dc62648bb74c6e5f311d9a72a87d0503c2 to ↵platform-tools-31.0.3Android Build Coastguard Worker
sdk-release" into sdk-release
2021-06-24Snap for 7487883 from 5e29f9dc62648bb74c6e5f311d9a72a87d0503c2 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Id23f79933c801690c7e93b1f5788c80804b3fb23
2021-06-05[automerger skipped] Set dist_group: "android" for external/apache-http ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Colin Cross
java_sdk_libraries am: 199612e35c am: 9373c1cf62 -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I1bb321af82a378a6627015c985d69b7bdb0ec793
2021-06-04[automerger skipped] Set dist_group: "android" for external/apache-http ↵Colin Cross
java_sdk_libraries am: 199612e35c -s ours am: 8ffaef845c -s ours am: 2d8e5e0ab8 -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I170db17d38f7b9115a0fff99417465fab3bce5d6
2021-06-04[automerger skipped] Set dist_group: "android" for external/apache-http ↵Colin Cross
java_sdk_libraries am: 199612e35c am: f4411f95ba -s ours am: 33874ef696 -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I96c2ba520756269835aa424bf8d73272fe7b5500
2021-06-04[automerger skipped] Set dist_group: "android" for external/apache-http ↵Colin Cross
java_sdk_libraries am: 199612e35c -s ours am: 8ffaef845c -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 199612e35c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I64eeaf8a220b543794904c82b005e1a9035f441a
2021-06-04[automerger skipped] Set dist_group: "android" for external/apache-http ↵Colin Cross
java_sdk_libraries am: 199612e35c am: f4411f95ba -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I3bec7e5918bdd2aa7ecbfee60f58ad74396eea11
2021-06-04Set dist_group: "android" for external/apache-http java_sdk_libraries am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseColin Cross
199612e35c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I2a77c793291e14aa75582c6fe7b43e0577d46883
2021-06-04Set dist_group: "android" for external/apache-http java_sdk_libraries am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseColin Cross
199612e35c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: I05395035ee70e0a22e8f9cb2769fd0a97b2c0bbd
2021-06-04[automerger skipped] Set dist_group: "android" for external/apache-http ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
java_sdk_libraries am: 199612e35c -s ours am skip reason: Merged-In I745a89015e20510bfbe63ae0930523f86bf96f1b with SHA-1 dfaf07afcd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-http/+/14845236 Change-Id: Ie4949fb9b1e0e6f1b509576541dcbe5e66dc202e
2021-06-04Set dist_group: "android" for external/apache-http java_sdk_librariesandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devColin Cross
dist_group replaces owner and the default is going to change, set it to the current default "android" for external/apache-http java_sdk_libraries. Bug: 186723288 Test: m checkbuild Change-Id: I745a89015e20510bfbe63ae0930523f86bf96f1b Merged-In: I745a89015e20510bfbe63ae0930523f86bf96f1b (cherry picked from commit dfaf07afcd1b6e25f09b6a5169f2dbada4e1f20f)
2021-06-04Merge "Set dist_group: "android" for external/apache-http ↵Treehugger Robot
java_sdk_libraries" am: f176328d3a am: 5e29f9dc62 am: e62ccf69d8 am: f4bc10d24f Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526 Change-Id: Id9db867015a9c82945e2bfefb3bf11d8b8899dd3
2021-06-04Merge "Set dist_group: "android" for external/apache-http ↵Treehugger Robot
java_sdk_libraries" am: f176328d3a am: 5e29f9dc62 am: e62ccf69d8 Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1701526 Change-Id: I9772eefca3540cd02aca2c737d221e845a79569b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 13:55:54 +0000