summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-08Snap for 8426163 from 8f0ac62e36e674045b25bfab897546ad1f21d283 to ↵android-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: Iebb3763cc38c64d9c1de61ada19ddd2ad42dbb1e
2021-10-07Snap for 7803083 from 26e1763a1538f7a11e7ba305464543077cfb0b30 to ↵Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: I344a0169be3a476f626235c93c2f098c7125431d
2021-04-03Merge "Upgrade expat to R_2_3_0" am: e72d9b81bb am: 1b8ae6d364 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
197794559f am: 15be57516e Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1662879 Change-Id: I391e6319cc621f37044841b89c57d58f7f8c77d3
2021-04-03Merge "Upgrade expat to R_2_3_0" am: e72d9b81bb am: 1b8ae6d364 am: 197794559fandroid-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-devTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1662879 Change-Id: Ibcf4c50917735fbcaac9dab21ab5de2516501c03
2021-04-02Merge "Upgrade expat to R_2_3_0" am: e72d9b81bb am: 1b8ae6d364Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1662879 Change-Id: Iea65b221f50f7d128ae526fcce37c00a12ba29e1
2021-04-02Merge "Upgrade expat to R_2_3_0" am: e72d9b81bbandroid-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1662879 Change-Id: I743da1d44de7a68468c3d4ab545d2c9c54b22a6e
2021-04-02Merge "Upgrade expat to R_2_3_0"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-02Upgrade expat to R_2_3_0Elliott Hughes
Test: make Change-Id: I59fc27b318cf832555ce17d7c3747924901f5f1b
2021-03-05Merge "Add min_sdk_version for ART module." am: f28db35a31 am: 9d22de0363 ↵Nicolas Geoffray
am: e65f24fe64 am: 2b221f0409 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1615845 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52980062fb3ad9a94d085028732d8e747f10c4b7
2021-03-05Merge "Add min_sdk_version for ART module." am: f28db35a31 am: 9d22de0363 ↵Nicolas Geoffray
am: e65f24fe64 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1615845 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6f0af8265ff494f302eed65fc9e3272d75aa928
2021-03-05Merge "Add min_sdk_version for ART module." am: f28db35a31 am: 9d22de0363Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1615845 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2ffff984fd5f060ca5fddc33397075bdac987af
2021-03-05Merge "Add min_sdk_version for ART module." am: f28db35a31Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1615845 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94523b62c847a4a7fd3e69bd30a2abb6c012bc5d
2021-03-05Merge "Add min_sdk_version for ART module."Nicolas Geoffray
2021-03-04Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: Ie10e7ec74faeef97ac8292cd88a81fd4c1ba2f2a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5a98fa0998 -s ↵Xin Li
ours am: 09aa922465 -s ours am: 9c868f121b -s ours am skip reason: Change-Id Icf2794737ed2533dea100a8dd297cd9d9a052638 with SHA-1 83767f8133 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b5b9a3e1170459cd52651476e10829292edc187
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5a98fa0998 -s ↵Xin Li
ours am: 09aa922465 -s ours am skip reason: Change-Id Icf2794737ed2533dea100a8dd297cd9d9a052638 with SHA-1 83767f8133 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I09fbd1c55fb265ad0aa29545f4c03471c1b5c5a0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 5a98fa0998 -s oursXin Li
am skip reason: Change-Id Icf2794737ed2533dea100a8dd297cd9d9a052638 with SHA-1 83767f8133 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e528322c79588911f1e60a2550ed55d6908a1c6
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Icf2794737ed2533dea100a8dd297cd9d9a052638 Change-Id: Ic600fb8f82cd2a444bb29dcd016590203360171d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/expat" am: 37db65ec52 am: ↵Bob Badour
9bf6732dfb am: d635a5d169 am: 23f2a64e6f Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1588622 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61ca3af1a72087265d360d02e4d457f453e42d55
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/expat" am: 37db65ec52 am: ↵Bob Badour
9bf6732dfb am: d635a5d169 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1588622 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1bc3e89a8b5301327207ddcabe02e601304be32
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/expat" am: 37db65ec52 am: ↵Bob Badour
9bf6732dfb Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1588622 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I090e8ecaa76bda20959216f55c28694b9c34812a
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/expat" am: 37db65ec52Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1588622 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaad2008a20da5a51b68d684155f662935c72a0b1
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/expat"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/expatBob Badour
Added SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-GFDL SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If7283bf912da9ce4aade3848b9092c5b26bff1dc
2021-01-26Merge "Fix license_type. Contains GFDL" am: 68cf373721 am: f9285a9b36 am: ↵Treehugger Robot
6a8082ee5e Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1559130 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3c13ca31fef6f13c26e61ac307852f547872877
2021-01-26Merge "Fix license_type. Contains GFDL" am: 68cf373721 am: f9285a9b36Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1559130 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52c23958fd7de6cd2e97c4f45cf0bd68be27cb2d
2021-01-26Merge "Fix license_type. Contains GFDL" am: 68cf373721Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1559130 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie7d417778970e576423e3f7c97ee991c29184528
2021-01-26Merge "Fix license_type. Contains GFDL"Treehugger Robot
2021-01-25Fix license_type. Contains GFDLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I61a94a96a0560f5946696a2ce2a49865ea057014
2020-11-24Mark ab/6881855 as merged am: de3449cb2f am: 83767f8133Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/expat/+/13112602 Change-Id: Ie0fca7fe09cf618820a0dce8f6971d107ee6f6d3
2020-11-24Mark ab/6881855 as merged am: de3449cb2fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/expat/+/13112602 Change-Id: Icf2794737ed2533dea100a8dd297cd9d9a052638
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Id4adb87dfaa927ad3a779071e1e5f0673eb91dd6
2020-11-12Merge "Add "product_available" to product available modules" am: d0421c7cec ↵Treehugger Robot
am: 7b2ba68350 am: 794a2874c1 am: 865e693d2a Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1495737 Change-Id: Ieb1e2033d8c1084d46e7a10448affe42b228234f
2020-11-12Merge "Add "product_available" to product available modules" am: d0421c7cec ↵Treehugger Robot
am: 7b2ba68350 am: 794a2874c1 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1495737 Change-Id: I75b8a4be674d83eaf0c1ba31d6cc4aea36c55470
2020-11-12Merge "Add "product_available" to product available modules" am: d0421c7cec ↵Treehugger Robot
am: 7b2ba68350 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1495737 Change-Id: I0c21ae2806b6e76d73c926bf69ebb1582389250f
2020-11-12Merge "Add "product_available" to product available modules" am: d0421c7cecTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1495737 Change-Id: I22199ea362a7edaabb0b50cb667067f2e5022b10
2020-11-12Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I8fbc71084798634e0cc8faf4f66d7da132e127bb
2020-10-30Merge "Upgrade expat to R_2_2_10" am: eab009c8f9 am: 114969c7c2 am: ↵Haibo Huang
aa30458d2a am: da42e6f3fa Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1479349 Change-Id: I3a3de21176986a2df2557be0128b5db7d5fc88bb
2020-10-30Merge "Upgrade expat to R_2_2_10" am: eab009c8f9 am: 114969c7c2 am: aa30458d2aHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1479349 Change-Id: I56718571ac7815daa05ef4e7321877e5bd9356fa
2020-10-30Merge "Upgrade expat to R_2_2_10" am: eab009c8f9 am: 114969c7c2Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1479349 Change-Id: I2a3fbb1299e4f4ea99b860c09c60881f5b9bba41
2020-10-30Merge "Upgrade expat to R_2_2_10" am: eab009c8f9Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1479349 Change-Id: I54d1c7ecbceb1219608c033f7610bd58dd706493
2020-10-30Merge "Upgrade expat to R_2_2_10"Haibo Huang
2020-10-29Upgrade expat to R_2_2_10Haibo Huang
(Keeping the `#if defined(__BIONIC__)` around the HAVE_SYSCALL_GETRANDOM define, which got dropped somehow.) Test: make Change-Id: I3a26a4ff32a2e6b53eb519f1ae09839f24b826d7
2020-10-23[automerger skipped] Merge "Rename ART release APEX to com.android.art." am: ↵Martin Stjernholm
9ac3883b11 am: 73608746ea am: 270e738e06 am: b2fe3ccea0 -s ours am skip reason: Change-Id I366b96f2b643b9f5bbb2bed030f820c35540664e with SHA-1 98a0a74071 is in history Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1456728 Change-Id: I9007b908d8e054248fd56a6c0a6b26c6fafb829e
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 9ac3883b11 am: ↵Martin Stjernholm
73608746ea am: 270e738e06 Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1456728 Change-Id: I15a96fd94b1da5e7e937789b425a4138c17d8228
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 9ac3883b11 am: ↵Martin Stjernholm
73608746ea Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1456728 Change-Id: I29a8e9b88a18b01c05aab775ccf8e804fa30d0d8
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 9ac3883b11Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1456728 Change-Id: I3d1c9ef935cbbd5cfd9b581d4d236fa395b05f59
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: I366b96f2b643b9f5bbb2bed030f820c35540664e Merged-In: I366b96f2b643b9f5bbb2bed030f820c35540664e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 14:25:20 +0000