summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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 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
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 Change-Id: I76dfe1819b423b7ba3cee6223f7754ad36a2ffbe
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 Change-Id: I6a39e01a992f98f1e550a114756b8b0c1f932d99
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 skip reason: subject contains skip directive Change-Id: I7b9784c6325cee3091271ab1bfeb598827efe2dc
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ib0b21747229fa23aa25213e0b212b7336dc1df90
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a am: 94dda2944d ↵Nicolas Geoffray
am: bf8249d749 am: b5a5260a71 Change-Id: Ic5dfc7cb965459ae935cad779cb714ed85645e10
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a am: 94dda2944d ↵Nicolas Geoffray
am: bf8249d749 Change-Id: I9a6bb9fa94e355c63ac1c9930f0454e0ea16dd27
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a am: 94dda2944dNicolas Geoffray
Change-Id: I4f69e42dd72220a38348efa601360c353ed7dfaf
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45aNicolas Geoffray
Change-Id: Idb37db3e007702748c63b924eeeecb52e1522b36
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45aNicolas Geoffray
Change-Id: If7d1dcb20679d73cedf44e361790298abbeff990
2020-04-03Merge "Remove testdex version." am: e01c2851a1Nicolas Geoffray
Change-Id: I8cd24665bac677701d4146248fdbcf213a21bad8
2020-04-03Merge "Remove testdex version."Nicolas Geoffray
2020-04-03Remove testdex version.Nicolas Geoffray
Unused anymore. Test: m Change-Id: Iffc2db2c7968069e9c36fb7e9b8826de90604a5a
2019-12-20Merge "Revert submission ↵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-releaseAutomerger Merge Worker
1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: 6527de11d5 am: 2dca977832 am: 95e1a12154 Change-Id: I5b727c0388dcdb76477e47696ad6950d347a1e1d
2019-12-20Merge "Revert submission ↵android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: 6527de11d5 am: 2dca977832 Change-Id: I18362b25771b180791f0716b329662c11d1eb863
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 08:44:02 +0000