OSDN Git Service

Merge "Support strict mode private DNS on VPNs that provide Internet." am: a56eab41a6
authorChalard Jean <jchalard@google.com>
Fri, 10 May 2019 11:33:43 +0000 (04:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 11:33:43 +0000 (04:33 -0700)
commit414b8c8b1ce8ae2ad6ef95c1ffba19062077d3e6
tree0fb4201ed168c34991a23da39e4c1907a3c30c95
parent5545ab1c22f321922b3b2854f4823504e5e7a340
parent549439cc9266bce31f4298058aa86a65434a97d1
Merge "Support strict mode private DNS on VPNs that provide Internet." am: a56eab41a6
am: 549439cc92

Change-Id: I28cc679def7cdd4dc5187e65f4524c3998ebcafc
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java