tree f96f331b591115adec77e335f4e4bf9fb656eaba
parent db24f2f8c81468da13cfc12aaf0ba599c64e911f
parent f9f10f804488def7ae2ceba3f345b89fc1c1fda1
author Luke Huang <huangluke@google.com> 1547042463 -0800
committer android-build-merger <android-build-merger@google.com> 1547042463 -0800

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

Change-Id: Idfbe46d0a0b6db28856093942a55dc47c6bef1cf