tree 59e684a240fa96c1240deed0669ee60999d9903f
parent 84e77e7a4bcd47af06be6ae8d2b0d859cbe342e3
parent 9fedafaf24e8b41e0fafd15a83bfe79168244c53
author Luke Huang <huangluke@google.com> 1566997609 -0700
committer android-build-merger <android-build-merger@google.com> 1566997609 -0700

Merge "Support enable/disable dns forwarding of dnsmasq"
am: 9fedafaf24

Change-Id: Ic3b2ad037be80ff4ad3d3a7d08283c8d2177120c