OSDN Git Service

Merge "Add the DNS query hook to net context"
authorBen Schwartz <bemasc@google.com>
Mon, 22 May 2017 03:00:43 +0000 (03:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 03:00:43 +0000 (03:00 +0000)
commit8c298ad10235f9df6a06fad96b0cdd7959f2113b
treecce003040b0d1a8d50796ad464503e90cee75957
parentc29146f9d01744acc9a752cf0d171128805d4a18
parent761bb2be4d2e1c1d564f6ef2c24971d2528ce2f1
Merge "Add the DNS query hook to net context"
am: 761bb2be4d

Change-Id: I00da8f2a38502a5b9abe421672dfd861d76f3a65