tree f4369bd16d8de7d5df03f4ab9cc9b87d35677adb
parent 5b4dfcda1f9e7db17593b20461c7d21b3d0e033f
parent 50c86d592af09379ecba8a2332a6dd8e8098ff89
author Luke Huang <huangluke@google.com> 1553250957 -0700
committer android-build-merger <android-build-merger@google.com> 1553250957 -0700

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

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e