tree 2c3d666c7098729d5b04b44511ff671f61f185c4
parent f087b538370d6a6dd94ee4009c9452408be391b8
parent 9d315db9911e1843d0ed640ceb1d45b240a31982
author Bruce Chen <chenbruce@google.com> 1599704120 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599704120 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: c8402de362 am: b6ff4a2999 am: e0a397967e am: d974302860 am: 9d315db991

Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829

Change-Id: I8d148b7e3a9311e8516755d060396e840bf8f2c5