OSDN Git Service

Merge "Add the DNS query hook to net context" am: 761bb2be4d
authorBen Schwartz <bemasc@google.com>
Mon, 22 May 2017 03:05:44 +0000 (03:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 03:05:44 +0000 (03:05 +0000)
commit8e23b44e57797eed31532c356feb9c915d8858ca
treeaa6d09499aefba0180aa29e5614c0c5a039db2a7
parent4b0c81661b7397b1d0dfed6d5113eca4e336515a
parent8c298ad10235f9df6a06fad96b0cdd7959f2113b
Merge "Add the DNS query hook to net context" am: 761bb2be4d
am: 8c298ad102

Change-Id: Ib83a84a620887a1e572a4cd06f25c3966dfff45a