aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478028 from fed7ae8e71db610821936452ee7dcd1850c9d745 to ↵android-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-releaseandroid-build-team Robot
mainline-adbd-release Change-Id: I2e50768dd75f842f8365e37ef0fdd206ea1e36c4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8022ba4c5c -s ↵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-releaseXin Li
ours am: ed75f5409d -s ours am: 80d8601830 -s ours am skip reason: Change-Id I57fd1311f32a700716e6bb7ddeffc0aeb794e374 with SHA-1 e64f4deecb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9549919a38d8fbd61a4de26d46bce1ee42d0236f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8022ba4c5c -s ↵android-s-v2-preview-1android-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_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-1android-s-qpr3-beta-1Xin Li
ours am: ed75f5409d -s ours am skip reason: Change-Id I57fd1311f32a700716e6bb7ddeffc0aeb794e374 with SHA-1 e64f4deecb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I808cf7f2f6f7336f592802131a7c485445fbe6c7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8022ba4c5c -s oursXin Li
am skip reason: Change-Id I57fd1311f32a700716e6bb7ddeffc0aeb794e374 with SHA-1 e64f4deecb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3f6d6db320f004831c42a9aeac9cf6ad030e236
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I57fd1311f32a700716e6bb7ddeffc0aeb794e374 Change-Id: I982720aea1ce27797f803ab0f9518176271d82ba
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcups am: e77763dbe0 am: ↵Bob Badour
9fdf58c9fc am: 03ef70a58f am: 0ef109412e Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1587910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c420ac44a3d20ed892db45ce1b0dab1ca84dca0
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcups am: e77763dbe0 am: ↵Bob Badour
9fdf58c9fc am: 03ef70a58f Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1587910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If00543b9d8219bd9ecd5695f31152ca51bc591b9
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcups am: e77763dbe0 am: 9fdf58c9fcBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1587910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f66b053f390f3bfaf6c6a597d0bbb4e0b74677d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcups am: e77763dbe0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1587910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I569f13190fd6bcfb4bab950cc73df87feeb6b225
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libcupsandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-ISC SPDX-license-identifier-LGPL SPDX-license-identifier-MIT SPDX-license-identifier-Zlib legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I51077f5a959b435b4148f572c42afb816e583e40
2021-02-04Remove me from OWNERS files am: 9913abc27b am: 9b6e64e0fc am: b725128ef9 am: ↵Philip P. Moltmann
f9ff6549cc Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1573029 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f49bc203bc97fdbfe59f9b6336bce52cccdb752
2021-02-04Remove me from OWNERS files am: 9913abc27b am: 9b6e64e0fc am: b725128ef9Philip P. Moltmann
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1573029 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I047c47d7161937554ccb5a7bb2f868541b6c9291
2021-02-04Remove me from OWNERS files am: 9913abc27b am: 9b6e64e0fcPhilip P. Moltmann
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1573029 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib976e26c2fd9de97d38742762d7aee596f72d811
2021-02-04Remove me from OWNERS files am: 9913abc27bPhilip P. Moltmann
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1573029 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9da77cd9902e4eb0c82aadb7f4bf080a90c25ebb
2021-02-03Remove me from OWNERS filesPhilip P. Moltmann
Test: n/a Change-Id: I44513bfc2b70cadc46816feb97e2631b8ba1b8da
2021-01-25Add BY_EXCEPTION_ONLY header comment. am: 641e68e8c5 am: b9968df27a am: ↵Bob Badour
72573c6d4a Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1559291 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idf2773901ca34d973c44f9da28f023000cee2623
2021-01-25Add BY_EXCEPTION_ONLY header comment. am: 641e68e8c5 am: b9968df27aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1559291 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0435ebf9a215a2864595b5668171413d69c86f8
2021-01-25Add BY_EXCEPTION_ONLY header comment. am: 641e68e8c5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1559291 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7bc87afb9693bb9b7a961253434cb0972e08cb62
2021-01-24Add BY_EXCEPTION_ONLY header comment.Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: Ica57f34370eeb25d6ddac467171668df6af5eab5
2021-01-24Add comment for added restriction. am: 9c9aebabcc am: dd500b6000 am: 0f735676ffBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1557592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I197dd96eda577b8910f8ba11c91499054068089e
2021-01-23Add comment for added restriction. am: 9c9aebabcc am: dd500b6000Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1557592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8714a0fd72c56a008c7eeb9c0c6d8fcc9a3d41bb
2021-01-23Add comment for added restriction. am: 9c9aebabccBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1557592 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c9685375addbd8ee34b14d0768a48bf075d1155
2021-01-22Fix license_type. Contains Apple Inc. License am: 711a985909 am: 502974af4e ↵Bob Badour
am: ad39aa6370 Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1556644 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica9658d0ca726f9064c29c36ca09729173195457
2021-01-22Fix license_type. Contains Apple Inc. License am: 711a985909 am: 502974af4eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1556644 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c42a52da043a7ee6fff46bda88e56721af511ec
2021-01-22Fix license_type. Contains Apple Inc. License am: 711a985909Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1556644 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58775e942d30ead4b529e2f2779482c7fab27734
2021-01-21Add comment for added restriction.Bob Badour
Apple licensed file in otherwise GPL project. See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I28c43938f926aea01b6dee4d3d5d0cab1d7bb720
2021-01-21Fix license_type. Contains Apple Inc. LicenseBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I9e106ef3f749736cd73f37de6c2079eb39d5b2ab
2021-01-05Stop building various files we don't need. am: 830925a73a am: f3138d2b84 am: ↵Elliott Hughes
abc1858d6d Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1532039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d129191621aceba0946082437a380df8bdc4db0
2021-01-05Stop building various files we don't need. am: 830925a73a am: f3138d2b84Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1532039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If2f3772619802392b01b060d8b0093a47b14021d
2021-01-05Stop building various files we don't need. am: 830925a73aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1532039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f21cfae403e748cb33282604641930ae0708581
2020-12-16Stop building various files we don't need.Elliott Hughes
Test: treehugger Change-Id: I3a2334cecbfe37f66f742df62fb9d948419a3244
2020-12-16Merge "Upgrade libcups to v2.3.3" am: 51b2b43e4c am: 27eaea7b56 am: e64f4deecbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1479395 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2fb1fb490964d270bb41adc18c3c13e51ec2ee4
2020-12-16Merge "Upgrade libcups to v2.3.3" am: 51b2b43e4c am: 27eaea7b56Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1479395 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57fd1311f32a700716e6bb7ddeffc0aeb794e374
2020-12-16Merge "Upgrade libcups to v2.3.3" am: 51b2b43e4cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1479395 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0fdde3e53f7aea38248116bc7ee3b0cee5b736f0
2020-12-16Merge "Upgrade libcups to v2.3.3"Treehugger Robot
2020-11-24Mark ab/6881855 as merged am: 7cda776cf5 am: 9211d8b4a7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/13112838 Change-Id: I7e63dde1077b56b1ed5893cabd58c6bf1a6bf835
2020-11-24Mark ab/6881855 as merged am: 7cda776cf5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/13112838 Change-Id: I115fdcb63d88cc62627e17059f2b3f3e1dce7fe7
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I7c6784ddf448a83b35ce08db29746ba8163794bb
2020-10-30Upgrade libcups to v2.3.3Haibo Huang
(Stop building getifaddrs.c which seems to have been broken upstream and which we don't use anyway.) Test: make Change-Id: I3a33013c2648bc4831d1c6d6e369f8d5b7976895
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a19103611a -s ours am: ↵Xin Li
744948bad3 -s ours am: 333538c2cb -s ours am skip reason: Change-Id Ie18feba1425db7de23b4689f294729a763c17b39 with SHA-1 afe0f83504 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/12795748 Change-Id: I06b221df2dd1d4ca75f554c1757c55b87ee25461
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a19103611a -s ours am: ↵Xin Li
744948bad3 -s ours am skip reason: Change-Id Ie18feba1425db7de23b4689f294729a763c17b39 with SHA-1 afe0f83504 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/12795748 Change-Id: I5f32b85dd3e3d2e8030f27294305ca95c2187ce0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a19103611a -s oursXin Li
am skip reason: Change-Id Ie18feba1425db7de23b4689f294729a763c17b39 with SHA-1 afe0f83504 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/12795748 Change-Id: I6425ba56642882c57c86d3966b13ca59b461c798
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ie18feba1425db7de23b4689f294729a763c17b39 Change-Id: I90fd440196f2e5312a46af9d4cb6ddb5c56ace19
2020-09-11[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 ↵Xin Li
-s ours am: 2279862c16 -s ours am: b05373039c -s ours am: e3275547e8 -s ours am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: I8fad484d8091d270d1dd7486cee80b1e07544c6b
2020-09-11[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 ↵Xin Li
-s ours am: 2279862c16 -s ours am: b05373039c -s ours am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: Iedac4ae2a9b1772c616237b3c14d1fd24ee29653
2020-09-11[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 ↵Xin Li
-s ours am: 2279862c16 -s ours am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: I62d75dd115035aa67e3a1d61f2bd901d8c230e1a
2020-09-11[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 ↵Xin Li
-s ours am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: I354d899d5732810df09c2db6ecd61dfba4a21dc3
2020-09-11[automerger skipped] Merge Android R am: 67b241e194 -s oursXin Li
am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: If76e0fffcf72eac8a70a5078847bd09c69673a97
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I9201aafffe0549b8e13536adb9ff5099dfa91174 Change-Id: I8ef0ecdc8a7566ca4dbce0a732ef74b25544c8db
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: bab090c692 -s ours am: 43eeddabb5 -s ours am: 764c221e2d -s ours am: 962b53d74a -s ours am skip reason: Change-Id I5adecc1081899f9190b788027d3775ef3da01098 with SHA-1 9b4d98410c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcups/+/12469999 Change-Id: I1d88681af4f8224240726dce2497ccf884b9d941
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 23:48:44 +0000