summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_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_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-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_332714010Maria Uretsky
am: c7595b9b1e am: 11a39972e1 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: I338c60748464458a9a2ebbca519f04fdf70d3386
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 ↵Maria Uretsky
am: c7595b9b1e Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: If64b9f87c7f4d02ed759053dfbfa5e76d4216507
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: Ia87b4edd99cd947d7202b946cea970d6608c4425
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685cebandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: I91ad6a83ff829dd45736a66ef9bfd442aabea302
2021-12-08Merge "Update cpe for vulnerability scanners"Maria Uretsky
2021-12-08Update cpe for vulnerability scannersMaria Uretsky
Bug: http://b/201572953 Change-Id: Id51ecc4caa8da24ad7824f1111920511a97492b4
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Iccd8972f7bd865e1e6c425a3f00b5a0fed06101b
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d am: 786d634338 am: 1b6b75b124 am: 6cde0c9a38 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 Change-Id: Icd65ce32b02db400bc194ee339f06b97963047e2
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797 ↵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-releaseNicolas Geoffray
am: 8d34c1b66e am: 8d457a81c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia307328e02bb3cd77f5e6d1b572063b76c275c1a
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797 ↵Nicolas Geoffray
am: 8d34c1b66e am: 8d457a81c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6bb3e881f5b3778e3942a9b2e3c20f99d5356df3
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797 ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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_r16android12L-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-s-v2-preview-1Nicolas Geoffray
am: 8d34c1b66e Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib99a8a728aba13e7e9b6dda44158e9090adca76e
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67daa064dcb7cd6aef840a3298e1e322a4369b5c
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545eaandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia34c4ae688f203acebe31a3f024126bc6be1e044
2021-03-04Merge "Add min_sdk_version for ART module."android-s-beta-2android-s-beta-1Nicolas Geoffray
2021-03-03Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: I2e154a2e2301de76ff7a660d0666ae07e64638dc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3672eecc79 -s ↵Xin Li
ours am: 96ede1cbc4 -s ours am: 8a1c5bb1f7 -s ours am skip reason: Change-Id If9d47943a9386f3d2e4df9e239442c463446f0fc with SHA-1 b958d72d38 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I28caa0046b81c9dbf6ffed2ba63d40205e1ce1f0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3672eecc79 -s ↵Xin Li
ours am: 96ede1cbc4 -s ours am: 8a1c5bb1f7 -s ours am skip reason: Change-Id If9d47943a9386f3d2e4df9e239442c463446f0fc with SHA-1 b958d72d38 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I344baf85e69cf2490167dc8c100f72f3da90eae3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3672eecc79 -s ↵Xin Li
ours am: 96ede1cbc4 -s ours am skip reason: Change-Id If9d47943a9386f3d2e4df9e239442c463446f0fc with SHA-1 b958d72d38 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2271c0ccf81f7520c8ff2fef199cda49e922d0e7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3672eecc79 -s oursXin Li
am skip reason: Change-Id If9d47943a9386f3d2e4df9e239442c463446f0fc with SHA-1 b958d72d38 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie4b86e28ae55ae16c52f6bcc60457ff9d720a673
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: If9d47943a9386f3d2e4df9e239442c463446f0fc Change-Id: I0980bd8822ae80d0c85681092037feb9eba10de3
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d am: 786d634338 am: 1b6b75b124 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ef38496c2ae1c470b1273a6c224308cd56a9ced
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d am: 786d634338 am: 1b6b75b124 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idf4f7db2a92203c1b1098128582943f891d99ea8
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d am: 786d634338 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0f354c57394a2d0e09c876f73301a9c1eb1e9dce
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If98dea267ecad81e57120150814012ea1a4b2d39
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied80b5d7398cde8c5843b71aaf9f71f759656bb4
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xmlBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-W3C to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I180f98bd19fabaec6d1b1f08d02674958a47f30e
2021-01-15Merge "Add visibilities for boot jars in prebuilt ART APEXes." am: ↵Treehugger Robot
3b89b6633f am: 6fa22d01e4 am: cf3e9669c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1533347 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ff35e4d227d33bce5ffd8e73416abc4d9289fb0
2021-01-15Merge "Add visibilities for boot jars in prebuilt ART APEXes." am: ↵Treehugger Robot
3b89b6633f am: 6fa22d01e4 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1533347 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf3246940ddc3359fd806fbf28184e78abc11bb5
2021-01-15Merge "Add visibilities for boot jars in prebuilt ART APEXes." am: 3b89b6633fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1533347 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b1b9017753a98b057a9d6b338bf107539b9ad94
2021-01-15Merge "Add visibilities for boot jars in prebuilt ART APEXes."Treehugger Robot
2020-12-17Add visibilities for boot jars in prebuilt ART APEXes.Martin Stjernholm
Necessary for https://r.android.com/1531910. Test: m nothing Bug: 171061220 Change-Id: Ib5eae3da943ad51b53734dd9d0fbb5617bdaefdc
2020-11-24Mark ab/6881855 as merged am: 28699590b7 am: b958d72d38Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/13111704 Change-Id: Ifb7fa238b769ee6daa8d49595df5cdd59b8e348d
2020-11-24Mark ab/6881855 as merged am: 28699590b7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/13111704 Change-Id: If9d47943a9386f3d2e4df9e239442c463446f0fc
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I4dd1a71697f1647ccba1517545f3be401ba39642
2020-10-23[automerger skipped] Merge "Rename ART release APEX to com.android.art." am: ↵Martin Stjernholm
0abda77bf9 am: 120ef28093 am: ca3f757e14 am: d9074e07ab -s ours am skip reason: Change-Id I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04 with SHA-1 339737a9dd is in history Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1456269 Change-Id: I2a618f337da312217a3fbc296f5e44eaf823f8cb
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 0abda77bf9 am: ↵Martin Stjernholm
120ef28093 am: ca3f757e14 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1456269 Change-Id: Ia62a477d11d6547232c1c023c5e8c6ad34efb743
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 0abda77bf9 am: ↵Martin Stjernholm
120ef28093 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1456269 Change-Id: I22b8ac082fc0a4111b64b2da3a9b7c435506d333
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 0abda77bf9Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1456269 Change-Id: I6637d107a21ad1f54aafa0cff6d4687d1dad1a39
2020-10-23Merge "Rename ART release APEX to com.android.art."Martin Stjernholm
2020-10-19Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04 Merged-In: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04
2020-10-14Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04 Merged-In: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: ↵Treehugger Robot
2086faacd7 am: 34c27d23bc am: ba465eb61f am: cd250914f4 Change-Id: If45358be3978ae64fabdef0805facccfc5627f7c
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: ↵Treehugger Robot
2086faacd7 am: 34c27d23bc am: ba465eb61f Change-Id: Ic59393606008b5d7511950e929dda71195f4b51e
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: ↵Treehugger Robot
2086faacd7 am: 34c27d23bc Change-Id: Id3aef55bcadd801b52f296880a8a13ca173da799
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: 2086faacd7Treehugger Robot
Change-Id: I5a7f4b08ecf4b6ea5b65ad23870f791c40f8b5de
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Id37f922fe32d34d08562addce3d9c75042f3225e
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to apache-xml: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ibb6771326a498b4a15c08f34b9f3670ae01eaf1b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 374d9c6abf -s ours am: be882fb465 am: 3450680d89 am: 0ed1e588d2 -s ours am skip reason: subject contains skip directive Change-Id: Ic48d92dffbb821a2415cb95094def7a78ae08ef0