OSDN Git Service

Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63 am: ad9c1115c3
authorBen Schwartz <bemasc@google.com>
Tue, 23 May 2017 13:32:28 +0000 (13:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 13:32:28 +0000 (13:32 +0000)
commit266ee2995d6532a8e3dd1149ae1ee4fec0a062d7
treef5fdd07274f3ea863be784f2b62fe5aea6b56730
parent2910bbfe73200d0336444a31c2b4163def5ec905
parentdc3fe10073558d8f52e9e4d4a22b52f6182801d8
Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63 am: ad9c1115c3
am: dc3fe10073

Change-Id: I57b5cee903532db0a305d5c80734709b14240d60