Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev am: 5b06dbd12b

author Joe LaPenna <jlapenna@google.com>

Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)

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

Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)
author Joe LaPenna <jlapenna@google.com>
Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	Joe LaPenna <jlapenna@google.com>
	Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history