tree f4c7a255d0c9be50a11be57406a87bd3bfd4f4c4
parent 59697cb8a8e3d2dd218128c4c5bf8a3864563ffc
parent 67da038184b9e799bb768f6df3583bc17fe47322
author Luke Huang <huangluke@google.com> 1547040865 -0800
committer android-build-merger <android-build-merger@google.com> 1547040865 -0800

Merge "Add control flags in asynchronous DNS query API" am: 9a0d6e60a3
am: 67da038184

Change-Id: I11f22266ab592595eb68b795059b07f999424fc3