OSDN Git Service

Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63
authorBen Schwartz <bemasc@google.com>
Tue, 23 May 2017 13:27:28 +0000 (13:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 13:27:28 +0000 (13:27 +0000)
commitdc3fe10073558d8f52e9e4d4a22b52f6182801d8
tree39e837b982292257c0dca73fa99aa8c86c08e6bb
parent8b142826914deca41eb48349f1780af5d6484f96
parentad9c1115c3e94d88ff72855eccb9cae21b3b3194
Merge "Make use of the DNS query hook in the netcontext" am: dc18a4be63
am: ad9c1115c3

Change-Id: I421aa5b4e4dc7fd743b80221313921ae4c36f25c