tree a43299302be5174c2500f6329ef509f0dcf1c53c
parent 7e7521a4c72015005c539a07e9b724af249dfb75
parent 3f2aa4190dbe2e4779110e47e47df90e4e4992cb
author Luke Huang <huangluke@google.com> 1560268009 -0700
committer android-build-merger <android-build-merger@google.com> 1560268009 -0700

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

Change-Id: I646cc1dd9a741296867cbb4b924e9a3d4714466e