summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 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 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: 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-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: 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: 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: 9a192e894bXin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-11-11dnsmasq: 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 oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance...Bruce Chen
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance...Bruce Chen
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance...Bruce Chen
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance...Bruce Chen
2020-09-10Merge "Update language to comply with Android’s inclusive language guidance"Bruce Chen
2020-09-09Update language to comply with Android’s inclusive language guidancechenbruce
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: b4504cce43...Treehugger Robot
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: b4504cce43...Treehugger Robot
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: b4504cce43Treehugger Robot
2020-04-29Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8aandroid-r-beta-3android-r-beta-2Treehugger Robot
2020-04-28Merge "Add METADATA to dnsmasq: GPL=RESTRICTED"Treehugger Robot
2020-04-28Add METADATA to dnsmasq: GPL=RESTRICTEDBob Badour
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ...Lorenzo Colitti
2020-04-16[automerger skipped] Don't enumerate interfaces if no interfaces were found. ...Lorenzo Colitti