aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-07Snap for 7189849 from 21ac59f295fbbae6cb4a1701da2f4fbe0944467c to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid-build-team Robot
Change-Id: I434b6f793c64e3d204e8d930eccbfa6467afe67b
2021-03-06Merge "Add LOCAL_LICENSE_KINDS to external/libpcap" am: b2567e7cc7 am: ↵android-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-releaseTreehugger Robot
3af923b260 am: 5256dd0161 Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1621425 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2901399b90208b7fbf27daab4c55b5c349e9bf76
2021-03-06Merge "Add LOCAL_LICENSE_KINDS to external/libpcap" am: b2567e7cc7 am: ↵Treehugger Robot
3af923b260 Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1621425 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f6e5a6e9997ab07ca320a8310395e93b54842a5
2021-03-06Merge "Add LOCAL_LICENSE_KINDS to external/libpcap" am: b2567e7cc7android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1621425 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie11a70f8df395ff648b5c59a098ca9d400ddb576
2021-03-06Merge "Add LOCAL_LICENSE_KINDS to external/libpcap"android-s-beta-2android-s-beta-1Treehugger Robot
2021-03-06Add LOCAL_LICENSE_KINDS to external/libpcapBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-ISC SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2e5f1cf7ca2b8554d5a3bf24f2c0618ca33bf620
2021-02-17Snap for 7149879 from 9926b3dc91be647aa0f62b21d62479beef8fac9f to sc-releaseandroid-build-team Robot
Change-Id: Ibd04f53e330c24817848c7790bced9287e20bd56
2021-02-16Merge "Fix license_type." am: bee6530897 am: 670dd9b349 am: d657a98675Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1588371 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a1d5224a5d0e720511b6396af96ce9fc1d8a4c0
2021-02-16Merge "Fix license_type." am: bee6530897 am: 670dd9b349Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1588371 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0acfad0cd5d85d3580655b52d15b9070090095eb
2021-02-16Merge "Fix license_type." am: bee6530897Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1588371 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ideabd32650538ef5ff5c85e058bf75b70b0e165e
2021-02-16Merge "Fix license_type."android-s-preview-1Treehugger Robot
2021-02-13Fix license_type.Bob Badour
All GPL3 findings either dual licensed or have bison exception. Test: m all Change-Id: I32d485f153afc70f56c829068c75e71e15ac93db
2021-01-07Snap for 7066627 from d452836f1bb93431e3acfcbcff1fb0737c85e369 to sc-releaseandroid-build-team Robot
Change-Id: I20d276fe6e945a580d9b082d29408b6a2c9d4207
2021-01-06Merge "Upgrade libpcap to libpcap-1.10.0" am: c1cf421806 am: 56dae89b50 am: ↵Treehugger Robot
42cd90cfc1 Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1541006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c702c8ad27745cbd3d1b75a3f66e2a496158ede
2021-01-06Merge "Upgrade libpcap to libpcap-1.10.0" am: c1cf421806 am: 56dae89b50Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1541006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I475ab0893b785139932fe82d65e15371d4574e2d
2021-01-06Merge "Upgrade libpcap to libpcap-1.10.0" am: c1cf421806Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/1541006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b6c46eeb32b1485f745b94490a243e857e15cfb
2021-01-06Merge "Upgrade libpcap to libpcap-1.10.0"Treehugger Robot
2021-01-05Upgrade libpcap to libpcap-1.10.0Haibo Huang
Test: make Change-Id: I2258baf45f03947a22b4853e6db95e7946f9eb53
2020-05-01Snap for 6450166 from 8ac014d123247fcc8bbdd3e4129169a65efb0c39 to sc-releaseandroid-build-team Robot
Change-Id: Ia7060b8e174b3bc6ecdd5dfa588e730e5c5a5e08
2020-04-30Merge "Upgrade libpcap to libpcap-1.9.1" am: 10a8728eaa am: 061669a9e3 am: ↵Treehugger Robot
53cebe242f am: 32cd7f3f5c am: ed85fbcf5a Change-Id: Iec9ecac6b38cb3247b3a96780864bae6164cc851
2020-04-30Merge "Upgrade libpcap to libpcap-1.9.1" am: 10a8728eaa am: 061669a9e3 am: ↵Treehugger Robot
53cebe242f am: 32cd7f3f5c Change-Id: I87ed21b9406239ad72e6da6cf13b42cc43df1864
2020-04-30Merge "Upgrade libpcap to libpcap-1.9.1" am: 10a8728eaa am: 061669a9e3 am: ↵Treehugger Robot
53cebe242f Change-Id: I94d0c92c5c85f8c3492943ded070a0bc4f76d037
2020-04-30Merge "Upgrade libpcap to libpcap-1.9.1" am: 10a8728eaa am: 061669a9e3Treehugger Robot
Change-Id: I6b812befc7e56d04337073d9da7262eb26125a6e
2020-04-29Merge "Upgrade libpcap to libpcap-1.9.1" am: 10a8728eaaandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I4d80ebabb689228840810e9fbb82e635748c7a6c
2020-04-29Merge "Upgrade libpcap to libpcap-1.9.1"Treehugger Robot
2020-04-25Snap for 6429502 from 5e325e7eb2e26a1a24af5416d85262ed490a2511 to sc-releaseandroid-build-team Robot
Change-Id: I36244966ba37ec14b9ddcdce3a644564714da62d
2020-04-25Merge "Upgrade to libpcap 1.9.1" am: 17ca3c0db5 am: 74bc37f036 am: ↵Haibo Huang
75fff1eb47 am: 3997e6c893 am: 73e45f54da Change-Id: I41f370cf6004905291c05817662f937317e8b51f
2020-04-24Upgrade libpcap to libpcap-1.9.1Haibo Huang
Test: None Change-Id: I79d703cbf9515fae69cadf637afbe71d43c2d878
2020-04-24Merge "Upgrade to libpcap 1.9.1" am: 17ca3c0db5 am: 74bc37f036 am: ↵Haibo Huang
75fff1eb47 am: 3997e6c893 Change-Id: I59d55e1883a4b8aa7c10b84fef523cac0d221683
2020-04-24Merge "Upgrade to libpcap 1.9.1" am: 17ca3c0db5 am: 74bc37f036 am: 75fff1eb47Haibo Huang
Change-Id: I2085d94cf4f1fdac59bd28fd2492bc9612ce2a73
2020-04-24Merge "Upgrade to libpcap 1.9.1" am: 17ca3c0db5 am: 74bc37f036Haibo Huang
Change-Id: I4fd2dac7681045c08235c31e2bec4730703ee647
2020-04-24Merge "Upgrade to libpcap 1.9.1" am: 17ca3c0db5Haibo Huang
Change-Id: I50f62fb14959d75f0f42d4ff92543def07c5104e
2020-04-24Merge "Upgrade to libpcap 1.9.1"Haibo Huang
2020-04-24Upgrade to libpcap 1.9.1Haibo Huang
Change-Id: I26905770a2acc947419f09111e8b595cefe9087c
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license" am: cfbd48b369 ↵Treehugger Robot
am: b0d515c3cc am: 8b7295c0f4 am: 8e80a7caf7 am: a9deae70d3 Change-Id: I823a23e7ea367faeca99b08ff2a19c1bf90e95eb
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license" am: cfbd48b369 ↵Treehugger Robot
am: b0d515c3cc am: 8b7295c0f4 am: 8e80a7caf7 Change-Id: I8967699865258ef112a2d370a7ca470775e8d83e
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license" am: cfbd48b369 ↵Treehugger Robot
am: b0d515c3cc am: 8b7295c0f4 Change-Id: I03961abf8251f24951282c8cf55f648d4a3af516
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license" am: cfbd48b369 ↵Treehugger Robot
am: b0d515c3cc Change-Id: I2ca79f910c55881501f48384d2cc1107ee720b49
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license" am: cfbd48b369Treehugger Robot
Change-Id: I8061323dfc5423150ead60e45c76963932d0123f
2020-04-24Merge "Add license type: contains GPL = RESTRICTED license"Treehugger Robot
2020-04-23Add license type: contains GPL = RESTRICTED licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I07262d1232b7ac081362066ef75a954c0a95f586
2020-04-11Snap for 6386567 from 0c5fe2452a740f012b578e3ef0aa890073dc1d40 to sc-releaseandroid-build-team Robot
Change-Id: If019860e3d4a6454bbf1db32e3be5e3929d2487e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dc48f0ba2 -s ours am: 552d433b83 am: c0a5ff9477 am: bb7a8f67f9 -s ours am skip reason: subject contains skip directive Change-Id: Ia5cc6de7e145298cfa5f8aa49db4855315c8d96f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dc48f0ba2 -s ours am: 552d433b83 am: c0a5ff9477 Change-Id: I53e33d9597d9d78a6cde03d5f08b39fb75897477
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dc48f0ba2 -s ours am: 552d433b83 Change-Id: I3d0c5144e3e58f94e66ed54efc3c3523632e663a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7dc48f0ba2 -s ours am skip reason: subject contains skip directive Change-Id: I3640218741d70efe4f2eb09bb0e3e8e2465d6ec4
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iec0a9b41f994058ffb132edbddd1e47405f44680
2020-03-20Snap for 6314039 from 39518dc73625a9dcd612935ea6586c070d5da84a to sc-releaseandroid-build-team Robot
Change-Id: I592631ba93d1b2a06d81f094ffababa68f813eca
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: bdc616413e -s ours am: db0e9db657 am: 047c65d4c1 am: a7f1cc1eb2 -s ours am skip reason: subject contains skip directive Change-Id: Ie838bfc288fc4878da8fe9326cdb71df8445a040
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: bdc616413e -s ours am: db0e9db657 am: 047c65d4c1 Change-Id: Ib6fec3447d73ed590e78305d72751f31de8377af
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 20:14:29 +0000