Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."

author Stephen Chen <stewchen@google.com>

Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)

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

Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)
author Stephen Chen <stewchen@google.com>
Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	Stephen Chen <stewchen@google.com>
	Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history