summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Merge sc-mainline-prodHEADt_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_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-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_tz5_341510010aml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I826a46bb0bb0f00f6e3e5fa43cd18e6b164cbcf2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver" 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-releaseTreehugger Robot
163d172c43 am: 52618ff151 am: 96094aaa05 am: 2abcdc887d Original change: https://android-review.googlesource.com/c/platform/external/mockwebserver/+/1588926 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If724033b3a1df15c142b039e8cc2f9312f922150
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver" am: ↵Treehugger Robot
163d172c43 am: 52618ff151 am: 96094aaa05 am: 2abcdc887d Original change: https://android-review.googlesource.com/c/platform/external/mockwebserver/+/1588926 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8583ca743307b7c4bb4a8ec2f37ff2b439828b44
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver" am: ↵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-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-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_r16main-plus-java-next-devandroid12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
163d172c43 am: 52618ff151 am: 96094aaa05 Original change: https://android-review.googlesource.com/c/platform/external/mockwebserver/+/1588926 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d36da93275ff06b1b14907b8ae280f939b30db8
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver" am: ↵Treehugger Robot
163d172c43 am: 52618ff151 Original change: https://android-review.googlesource.com/c/platform/external/mockwebserver/+/1588926 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I831443745c08d0defaba483188363fdc632eb0ed
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver" am: 163d172c43android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mockwebserver/+/1588926 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If17e3bfb9202ec72a1d1dee3b5d5fba86d9af79d
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserver"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/mockwebserverBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iea251bc357cefad277ff0fff4546cee0568eca3a
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d am: ↵Treehugger Robot
78f39a0b3d am: c2e0629d0a am: b3129f8c9b am: 8e39263c3e Change-Id: Ic4374751e05bb145f3fd752b3745b52a36f29522
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d am: ↵Treehugger Robot
78f39a0b3d am: c2e0629d0a am: b3129f8c9b Change-Id: Ibec7d4e7ce7be519fc53f1149b13e5b96533319b
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d am: ↵Treehugger Robot
78f39a0b3d am: c2e0629d0a Change-Id: I668178e02509b72dd28afa903a4b3ddf0350ede6
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d am: ↵Treehugger Robot
78f39a0b3d Change-Id: I713177dcca591125b6b81943a7faed8f97eaabac
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4dandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I030a20d1e36415648f6ee65ee43a0c7ebf0bfff4
2020-04-29Merge "Add METADATA to mockwebserver: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to mockwebserver: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Id5ccc26e08661eff2589c3bc1bd337b7983b8466
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: c54bde4bc9 am: ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseNeil Fuller
66cfa64792 am: 237c68a7b1 am: deaedfdb8c Change-Id: Idd2f56675cc36aa8306cb21de1c1fab7e0c47e04
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: c54bde4bc9 am: 66cfa64792android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseNeil Fuller
am: 237c68a7b1 Change-Id: Id8a250e95cdd09dac45e24710ee0a43bac650da4
2019-07-03Merge "Fix include syntax on libcore/OWNERS file" am: c54bde4bc9ndk-sysroot-r21Neil Fuller
am: 66cfa64792 Change-Id: I80fa785c93cbe3cdeefd0798f62dbc56a7db5ab7
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"Neil Fuller
am: c54bde4bc9 Change-Id: Ia9eaa68167e3e32ea28ebebc90a7abe10dea3d50
2019-07-03Merge "Fix include syntax on libcore/OWNERS file"android-o-mr1-iot-release-1.0.14Neil Fuller
2019-07-03Fix include syntax on libcore/OWNERS fileNeil Fuller
The syntax requires the project to be specified as a prefix. Change-Id: I773b32d7b31c39248e035c6a1439044f46132e4d Exempt-From-Owner-Approval: Fixes OWNERS Test: None
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file" am: e6a5264a24 am: ↵Neil Fuller
d00342068f am: d8b0cc458a am: 95ac9a2f8c Change-Id: I40d079934e994be3bad1e3be1096bde1020624dd
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file" am: e6a5264a24 am: ↵Neil Fuller
d00342068f am: d8b0cc458a Change-Id: I8d0cf2516e4f8feee29293e0272c4a4beb65ac45
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file" am: e6a5264a24Neil Fuller
am: d00342068f Change-Id: I2842e84a607166feede2f0fccec3419efb31f9eb
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
am: e6a5264a24 Change-Id: If03fdab13d01af27f4d80250f75a98d6818c0ee4
2019-07-02Merge "Update OWNERS to reference libcore's OWNERS file"Neil Fuller
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
Update OWNERS to reference libcore's OWNERS file Test: ls ../../libcore/OWNERS Change-Id: If50499d2792882794b1d0c84b62f3f29ef90edc8
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()." am: ↵Tobias Thierer
fde7df8250 am: 954e762c5c am: 2eee721aad Change-Id: Idd57f2cc85c9013412ba910c0677d2e567790def
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()." am: ↵Tobias Thierer
fde7df8250 am: 954e762c5c Change-Id: I71030801294b1484b9de91cfa83c27cb829b0524
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()."android-o-mr1-iot-release-1.0.13Tobias Thierer
am: fde7df8250 Change-Id: Ia371d32c9c7a4187c2d092cbb3c00896769ab790
2019-04-09Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTobias Thierer
2019-04-08Let MockWebServer respect MockResponse.getBodyDelayTimeMs().Tobias Thierer
MockResponse has a field bodyDelayTimeMs to indicate a desired delay between the end of the headers being sent and the start of the response body being sent, but MockWebServer wasn't respecting it. This CL fixes that. Bug: 129771436 Test: URLConnectionTest on top of http://r.android.com/940893 Change-Id: I9cdc2f3fcbe22c90c5edbc5ed822f233d1120b11
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 399b47aa53 -s ours am skip reason: subject contains skip directive Change-Id: I46886c91c5d49a8778bc501fb5ff0dc5dc4c58eb
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If5b0482d71001934e6041ae046cc594f7c76fb1b
2019-01-10Merge "Add default code reviewers into OWNERS" am: 8b3f51d37e am: 44559fc738Chih-hung Hsieh
am: fa57fe70f6 Change-Id: I95ae158ed1fa177ed12f4b3199bba607a04b1b20
2019-01-10Merge "Add default code reviewers into OWNERS" am: 8b3f51d37eChih-hung Hsieh
am: 44559fc738 Change-Id: Idccc26fbb860e9fd81e2084890c1c3ae317644b2
2019-01-10Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 8b3f51d37e Change-Id: I882cd77fbab6798ca7e88c500bfb494f9c56a75c
2019-01-10Merge "Add default code reviewers into OWNERS"android-q-preview-1android-o-mr1-iot-release-1.0.10Chih-hung Hsieh
2019-01-10Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ie988ad0c1fe73884c5610dae565a0d7e4ff9a6e4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ecf7904261 -s ours am: b9420a29db -s ours am: f8cf051340 -s ours Change-Id: I3bd07d6a828910abb37721fab8f64a3e4ea20591
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ecf7904261 -s ours am: b9420a29db -s ours Change-Id: Ic106b0fd43f10db1c2744c09ea51ce47daae6485
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: ecf7904261 -s ours Change-Id: Ib519c1efb9adb9e59d384672e0eacf09fcf24c63
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I7057e8f465b24c83a289e907d26a0a19a34413fe
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: a84c462e51 -s ours am: 353aeec854 -s ours Change-Id: I9b1d53fcf7c69c3af7de868a0b71dc56470ef09d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: a84c462e51 -s ours Change-Id: I0acd32bfd6f3e4e15f74c5d8506c9ab86147efa1
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Id8c691dbcba1ef76add31992305ddcc4167e0d04
2018-08-16Merge "Convert external/mockwebserver to Android.bp" am: 2631e2ca26 am: ↵Colin Cross
434a7b234b am: afbe9c1882 Change-Id: Id2b8e41309944cf6e48c6ac161de382f35267ec8
2018-08-16Merge "Convert external/mockwebserver to Android.bp" am: 2631e2ca26Colin Cross
am: 434a7b234b Change-Id: I53e26a28670fcbf9adc0c4f2fc0310850c1d6d94
2018-08-16Merge "Convert external/mockwebserver to Android.bp"Colin Cross
am: 2631e2ca26 Change-Id: Iae401fd576e349f360a1fb9e22465227e4fc768b
2018-08-16Merge "Convert external/mockwebserver to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 10:04:04 +0000