tree 6b42b02e46e060c8d42ff0b8485f4572b7bdefd9
parent 112b8bd6c5b9556d0658cda720604b3ce54f8a68
parent 391b3aa5327697d46a6576b8bacfcb1a1f2352f5
author Luke Huang <huangluke@google.com> 1553831144 -0700
committer android-build-merger <android-build-merger@google.com> 1553831144 -0700

Merge "Fix cancellation race problem for aysnc DNS API" am: 1859ae7e7d
am: 391b3aa532

Change-Id: I633a592c7f46162268a759f84a77211443e9a04e