Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c

author Ben Schwartz <bemasc@google.com>

Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)
author Ben Schwartz <bemasc@google.com>
Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
diff --cc packages/SettingsLib/res/values/strings.xml
Simple merge
diff --cc services/core/java/com/android/server/NetworkManagementService.java
Simple merge
author	Ben Schwartz <bemasc@google.com>
	Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/tests/coretests/src/android/provider/SettingsBackupTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/NetworkManagementService.java	patch \|	diff1 \|	diff2 \|	blob \| history