Valentin Iftime 55738c4aa0 resolve merge conflicts of c53848b014 to master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af

2019-10-08 22:21:44 +02:00

..

java/android/net

resolve merge conflicts of c53848b014 to master

2019-10-08 22:21:44 +02:00

jni

Fix issue for DnsResolver#query

2019-05-30 11:58:25 +00:00