tree 3360a2e44c100b27bccf6c5f8d418c2a91e2efdc
parent 1eb23ba267c44d86a8a003a425d1b9050f069800
parent aed6ea52dea9a1df5b385a585ec6d2f3f50b0411
author Luke Huang <huangluke@google.com> 1553226618 -0700
committer android-build-merger <android-build-merger@google.com> 1553226618 -0700

Merge "Support query cancellation for async DNS API"
am: aed6ea52de

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c