Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c

author Amin Shaikh <ashaikh@google.com>

Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)

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

Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)
author Amin Shaikh <ashaikh@google.com>
Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	Amin Shaikh <ashaikh@google.com>
	Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history