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)
am: dc3fe10073

Change-Id: I57b5cee903532db0a305d5c80734709b14240d60


Trivial merge