Merge "Restrict changing wi-fi networks" into oc-dr1-dev

author Christine Franks <christyfranks@google.com>

Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)

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

Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)
author Christine Franks <christyfranks@google.com>
Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)
diff --cc src/com/android/settings/Utils.java
Simple merge
diff --cc src/com/android/settings/wifi/WifiSettings.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/UtilsTest.java
Simple merge
author	Christine Franks <christyfranks@google.com>
	Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 26 Jul 2017 02:52:52 +0000 (02:52 +0000)
		1	2
src/com/android/settings/Utils.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/WifiSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/UtilsTest.java	patch \|	diff1 \|	diff2 \|	blob \| history