tree 6bb01e118d465d49a3ea5126fcffe80ffbe75494
parent 8c38fd7d02c4e9ae07e9ba8488c64aabc7440522
parent 0c1ffb0f9b3185420433315874e32f0e1bc7e3fb
author Luke Huang <huangluke@google.com> 1545212573 -0800
committer android-build-merger <android-build-merger@google.com> 1545212573 -0800

Merge "Following commit for asynchronous DNS query API" am: a89f04a742 am: b010078e40
am: 0c1ffb0f9b

Change-Id: Ia7922edb119c12f185684682fd4d097337125248