summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-03-14Merge "Snap for 8294919 from eab908dfa71205a892457041d4fa0367b62bcd1c to main...main-cg-testing-releaseAndroid Build Coastguard Worker
2022-03-14Snap for 8294919 from eab908dfa71205a892457041d4fa0367b62bcd1c to main-cg-tes...Android Build Coastguard Worker
2022-02-13Merge "Snap for 8178666 from 7917fa8a55b81115ce746e097e0f230bcf17f745 to main...Android Build Coastguard Worker
2022-02-13Snap for 8178666 from 7917fa8a55b81115ce746e097e0f230bcf17f745 to main-cg-tes...Android Build Coastguard Worker
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
2022-02-09Merge "dnsmasq: switch OWNERS to core networking" am: 7917fa8a55Treehugger Robot
2022-02-09Merge "dnsmasq: switch OWNERS to core networking"android-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Treehugger Robot
2022-02-08dnsmasq: switch OWNERS to core networkingMaciej Żenczykowski
2022-01-16Merge "Snap for 8084792 from 0e1b43076cc71ff8d87cae79f42a2e09c6c48e53 to main...Android Build Coastguard Worker
2022-01-16Snap for 8084792 from 0e1b43076cc71ff8d87cae79f42a2e09c6c48e53 to main-cg-tes...Android Build Coastguard Worker
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: fefd5d8...Treehugger Robot
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: fefd5d8aaeTreehugger Robot
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076cTreehugger Robot
2022-01-14Merge "Add updated cpe for vulnerability scanners"Treehugger Robot
2021-12-07Add updated cpe for vulnerability scannersMaria Uretsky
2021-10-10Merge "Snap for 7810574 from dd859ffd02200a86253441f32a55e2fecf0cb728 to main...Android Build Coastguard Worker
2021-10-10Snap for 7810574 from dd859ffd02200a86253441f32a55e2fecf0cb728 to main-cg-tes...Android Build Coastguard Worker
2021-08-22Merge "Snap for 7664297 from 7df2c06e2359333b70801a5c688211fe68bc82ef to main...Android Build Coastguard Worker
2021-08-22Snap for 7664297 from 7df2c06e2359333b70801a5c688211fe68bc82ef to main-cg-tes...Android Build Coastguard Worker
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 7df2c0...Xin Li
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 7df2c0...android-s-v2-preview-1android-s-v2-preview-1Xin Li
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
2021-06-14[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 a...Treehugger Robot
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: 81354...Xin Li
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 am: 325ea6bd6fTreehugger Robot
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: 81354396d4Xin Li
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8Treehugger Robot
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1Xin Li
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582"Treehugger Robot
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
2021-03-04[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours am:...android-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-qpr3-beta-1Xin Li
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours am:...temp_ab_7272582Xin Li
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s oursXin Li
2021-03-03Merge "Merge RQ2A.210305.007"android-s-beta-2android-s-beta-1Xin Li
2021-03-03Merge RQ2A.210305.007Xin Li
2021-03-02[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s ours...Xin Li
2021-03-02[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s oursXin Li
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d981f96871 -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d981f96871 -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4 am: ...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4 am: ...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq"Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasqBob Badour
2021-01-12Merge cherrypicks of [13320072, 13319971, 13320351, 13320073, 13320352, 13320...android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot
2021-01-12dnsmasq: fix heap overflowLuke Huang
2021-01-09Snap for 7071694 from eb35423b6a9aedcba6222d15055d7e1beac56b33 to rvc-qpr3-re...android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang