tree a0d569b2a9089fd0668ccf2e2ee056b32a26ccfc
parent 23bb56e15dab44f7f456e82b56b3b208cfc51a84
parent 0a423e4b35dacada4996cbf252a4f537feb1265a
author Bernie Innocenti <codewiz@google.com> 1570605043 -0700
committer android-build-merger <android-build-merger@google.com> 1570605043 -0700

Merge "Remove separate IPv4-only nsaddr_list from res_state"
am: 0a423e4b35

Change-Id: I7c8f04e20310350f05dde74974207a2481f8ab90