summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ...Luke Huang
2021-01-07backport: dnsmasq: fix heap overflow am: 303ca2733aLuke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: 5...Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: 5...Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: 5...Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: 9...Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35Luke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509fLuke Huang
2021-01-07dnsmasq: fix heap overflow am: 2c415e570aLuke Huang
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08c am: 9714eb8446 am: d1a1b7cf29Maciej Żenczykowski
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08c am: 9714eb8446Maciej Żenczykowski
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08cMaciej Żenczykowski
2021-01-05Merge "dnsmasq: Remove DAD Retry"Maciej Żenczykowski
2021-01-05dnsmasq: Remove DAD RetryTyler Wear
2020-12-08backport: dnsmasq: fix heap overflowLuke Huang
2020-11-24Mark ab/6881855 as merged am: 9a192e894b am: e9bfc647fdXin Li
2020-11-24Mark ab/6881855 as merged am: 9a192e894bXin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-11-11dnsmasq: fix heap overflowLuke Huang
2020-11-10Merge "dnsmasq: fix heap overflow"Luke Huang
2020-11-10dnsmasq: fix heap overflowLuke Huang
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s ours am: bb5...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s ours am: bb5...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s oursXin Li