From: Ben Schwartz <bemasc@google.com>
Date: Tue, 23 May 2017 13:32:28 +0000 (+0000)
Subject: Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63 am: ad9c1115c3
X-Git-Tag: android-x86-9.0-r1~611^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=266ee2995d6532a8e3dd1149ae1ee4fec0a062d7;p=android-x86%2Fbionic.git

Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63 am: ad9c1115c3
am: dc3fe10073

Change-Id: I57b5cee903532db0a305d5c80734709b14240d60
---

266ee2995d6532a8e3dd1149ae1ee4fec0a062d7