summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-18Merge "Move OWNER reference master=>main." into main am: 0ececdb598 am: ↵HEADandroid-u-qpr3-beta-2-gplandroid-u-qpr2-beta-3-gplandroid-u-qpr2-beta-1-gplandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseTreehugger Robot
8dd29cbba6 am: b606fce3a7 am: 035f8269b6 am: b8d1767a99 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2662418 Change-Id: I1b6a5c3d5546b7abf900670c60753f2667844e5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 0ececdb598 am: ↵android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplTreehugger Robot
8dd29cbba6 am: b606fce3a7 am: 035f8269b6 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2662418 Change-Id: I04a8af56fdf15924f332a209e13957a3225fb499 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 0ececdb598 am: ↵Treehugger Robot
8dd29cbba6 am: b606fce3a7 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2662418 Change-Id: Ib53ce8c326075592b43c879f242250d11b034bde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 0ececdb598 am: ↵Treehugger Robot
8dd29cbba6 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2662418 Change-Id: I86b910f13bf72e189ade577cfa65b424b35c5299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 0ececdb598android-u-rb-dp-10-gplandroid-u-rb-dp-10-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2662418 Change-Id: I71b9812840a9e3c5a9e1ac8ec0f29b5e9f3eecad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into mainTreehugger Robot
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I5f39eef5afaba4a873cf9eb8f8abb7ec5e9a39f6
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1 ↵Maciej Żenczykowski
am: 1f3212ea25 am: be4dfcea71 am: 0b9b3f69aa Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: Icd5429283784925a6d17a4005d8a43137db9a78b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1 ↵Maciej Żenczykowski
am: 1f3212ea25 am: be4dfcea71 am: ab61047d66 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: I45991d26cdf982e7d836d0cfcf22a8c4f5f2092d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1 ↵android-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseMaciej Żenczykowski
am: 1f3212ea25 am: be4dfcea71 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: I697f4953d7e5625bd9ce440175e97c64f5c045fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1 ↵Maciej Żenczykowski
am: 1f3212ea25 am: be4dfcea71 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: Icb80c53e6cf530f393b2a3bf918fa856738cfb6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1 ↵android14-devMaciej Żenczykowski
am: 1f3212ea25 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: I5bae1fc7c3e80dae5678b2fd1b1d325d7c5c764d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045 am: db943817a1android-u-beta-4-gplMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: Ie25c3410a12f94b45aaa12e11b91f400b6fb5588 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq" am: 3ab12b9045Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/2521155 Change-Id: I3d3936efb8d05ec8b9cac98fd94eb77bc3652635 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of dnsmasq"android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplMaciej Żenczykowski
2023-04-03Editing the METADATA file of dnsmasqSadaf Ebrahimi
Test: TreeHugger Change-Id: I22c431d0e2b44570740ea7a5fd2ece1b311a400a
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-wear-13.0.0-gpl_r1android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-t-qpr1-beta-3-gplandroid-t-qpr1-beta-2-gplandroid-t-qpr1-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: eab908dfa7 -s ours am: 8bc5a8c484 -s ours am skip reason: Merged-In I721b10f021733af81ab97952506e876ea82df06b with SHA-1 e0c27708be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/16842380 Change-Id: Ibcedf840ce8a2b9c9a1d06a333c9ddc33dfba625
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: eab908dfa7 -s ours am skip reason: Merged-In I721b10f021733af81ab97952506e876ea82df06b with SHA-1 e0c27708be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/16842380 Change-Id: Iafe2bb79d4c156a3983b5e9851b6ce4c791f8056
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I721b10f021733af81ab97952506e876ea82df06b Change-Id: I9e94488a5d7faa727a764cd36dc0f32ba9c9bab7
2022-02-09Merge "dnsmasq: switch OWNERS to core networking" am: 7917fa8a55 am: ↵Treehugger Robot
bdf0c29a69 am: 8eedf11c49 am: 86a910d979 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1977626 Change-Id: I93030cd069852622839c5275f9300c391d1dd230
2022-02-09Merge "dnsmasq: switch OWNERS to core networking" am: 7917fa8a55 am: ↵Treehugger Robot
bdf0c29a69 am: 8eedf11c49 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1977626 Change-Id: I9ed43e2679d7c22e5cf03178665cbf3f6830be46
2022-02-09Merge "dnsmasq: switch OWNERS to core networking" am: 7917fa8a55 am: bdf0c29a69Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1977626 Change-Id: Iad02f52eed346a658019664fe17a555999d1bf97
2022-02-09Merge "dnsmasq: switch OWNERS to core networking" am: 7917fa8a55Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1977626 Change-Id: Ibfa33dd320599e6ad4cd7447fa5beacb30063b2b
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
(effectively a no-op, just more directly accomplishes the same thing) Test: N/A, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I6abb4df80c682a5136ea9fc0767b7a48163dc532
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: ↵Treehugger Robot
fefd5d8aae am: 2b486bc3ad am: e155ba2e91 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1912488 Change-Id: Ie13e0992fc7aac05f50e72f13702e7c8b3b64e40
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: ↵Treehugger Robot
fefd5d8aae am: 2b486bc3ad Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1912488 Change-Id: I5423798f60735efc4c70574b578380f36ebfa9ce
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: fefd5d8aaeTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1912488 Change-Id: I4845c9998d711452fa21c3d0d9d4fc4b97c1a853
2022-01-14Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1912488 Change-Id: Icf8fc91743629ca8f6660470bf5c99c4a3267382
2022-01-14Merge "Add updated cpe for vulnerability scanners"Treehugger Robot
2021-12-07Add updated cpe for vulnerability scannersMaria Uretsky
Bug: b/201572953 Change-Id: I721b10f021733af81ab97952506e876ea82df06b
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
7df2c06e23 -s ours am: dd859ffd02 -s ours am: 9c1ffcdfe1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/15023941 Change-Id: I87855fc7dbce87d3d82c0ea32d8881f640190e8f
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
7df2c06e23 -s ours am: dd859ffd02 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/15023941 Change-Id: I3e7df76e328c5cf3899e882791cc571ec4f8ea97
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵android-s-v2-preview-1android-s-v2-preview-1Xin Li
7df2c06e23 -s ours am skip reason: Merged-In I50e6061b99e37561600c0c2524d6be12801e6863 with SHA-1 325ea6bd6f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/15023941 Change-Id: I39e252ddbb30f4eae55e95d94dd9dedaeb52cd66
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
Bug: 190855093 Merged-In: I50e6061b99e37561600c0c2524d6be12801e6863 Change-Id: I1e6a4a5e2092e166c5d914543e02d52cea0d0a69
2021-06-14[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 ↵Treehugger Robot
am: 325ea6bd6f am: d600a698b2 -s ours am: bcd19cad12 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: If01b2a46686b30f879583b650d68cccef190f828
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: ↵Xin Li
81354396d4 am: 46821eaeb5 -s ours am: ab3946803a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: Ia6a8da20c01584c07db7a8fdf129bb2aa38bafe7
2021-06-14[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 ↵Treehugger Robot
am: 325ea6bd6f am: d600a698b2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: Id6374a5d1678839eb1494a963cfda17e0e8d48b7
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: ↵Xin Li
81354396d4 am: 46821eaeb5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: I0c180d03204e6043b5bc96d5f791baee658a6d5c
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 am: 325ea6bd6fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: Ifaca98e8230032f5de81363d92961b99793d30ef
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: 81354396d4Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: Ib147fb4782a4a554405645fa563e8307d1f305d1
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: I50e6061b99e37561600c0c2524d6be12801e6863
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139 Change-Id: I570cac0bb61398920c453b99cf03584a7b04c291
2021-06-14Merge "DO NOT MERGE - Merge ab/7272582"Treehugger Robot
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Change-Id: I608a9a8e2bf232e01a972f93f200b6d204ea3995
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I7e3f937846aabdb51fbc3cec19fb847f9ee17756
2021-03-04[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵Xin Li
am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours am: 743b729bc0 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ec5a7bf540dc4c71e0d4af14142bf4fe4e80dfc
2021-03-04[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵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
am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours am: 743b729bc0 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I877673216d26f31bdd453c5a5dec85b3cb7e2035
2021-03-04[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵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
am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a2bb032939b78528c5e8d50fbb9b0296cc3e800
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵temp_ab_7272582Xin Li
am: 8028e19c81 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8f9c30eea81d70ff74c0b8feff6d5dd139a915f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 18:41:47 +0000