tree a9c9e595bcbf3bd19b766a5dfd3758c2f582697a
parent ca23c3f4f175d5a15a16f40f96d6aa0e3fd085ca
parent 5cc7d1b66f98196463c287f722b1a8525442b56a
author Luke Huang <huangluke@google.com> 1561391517 -0700
committer android-build-merger <android-build-merger@google.com> 1561391517 -0700

Merge "Separate resolv_getaddrinfo from android_getaddrinfofornetcontext" am: 29ba892338
am: 82f977fb97

Change-Id: Ie23a8227c8ddeff65dbc2230a1e4d099d5be62f5