tree 33406a48b6ab7fb40a8e888a31d3e54c15879ac8
parent 185dd4a5c4d987e773b7ada356123892a189d0d1
parent 9844eb95e4494dc27f06dba257508ca192a47d0e
author Treehugger Robot <treehugger-gerrit@google.com> 1581732444 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 1581732444 +0000

Merge "Add test config for resolv_integration_test" am: 9844eb95e4

Change-Id: I50f2b3e4bac02ad9136ae40d89ad9644882655e3