Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a

author Ben Schwartz <bemasc@google.com>

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

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

Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)
author Ben Schwartz <bemasc@google.com>
Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)
diff --cc res/xml/development_prefs.xml
Simple merge
diff --cc src/com/android/settings/development/DevelopmentSettings.java
Simple merge
author	Ben Schwartz <bemasc@google.com>
	Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)
		1	2
res/xml/development_prefs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/development/DevelopmentSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history