tree 07222c309915a1cfa632b5566820742a91b458b1
parent 24a3d76aa77c8fed3b1f38ae6783afa16b1afab0
parent cc949037c3cc041ad7f374765b435b7d2d2eee6e
author Luke Huang <huangluke@google.com> 1560268610 -0700
committer android-build-merger <android-build-merger@google.com> 1560268610 -0700

Merge "Fix race condition caused by fd reused for DnsResolver" am: 3f2aa4190d am: f8a2c15ca1
am: cc949037c3

Change-Id: I6268edd2b0f98694de7c55f8c6fac844cd5f8635