tree 36489c562c868e40610bb88b24a40d038032065b
parent 4bdc06e1740249b9700b0da0cc8ab58ed6cdb416
parent f4a9829a1871f2594754eede19e3af0410e0d2e9
author Luke Huang <huangluke@google.com> 1547040810 -0800
committer android-build-merger <android-build-merger@google.com> 1547040810 -0800

Merge "Add control flags in asynchronous DNS query API" am: c04f9f731a
am: f4a9829a18

Change-Id: I599cfea345a61286d74b87c9d4c7e5087e6e7308