Chalard Jean 5a4844e307 Cherry-pick the relevant parts of master change ...

I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d

2019-07-08 20:25:45 +09:00

..

java/android/net

Cherry-pick the relevant parts of master change

2019-07-08 20:25:45 +09:00

jni

Fix issue for DnsResolver#query

2019-05-30 06:34:03 +00:00