Merge "Ensure only test print services enabled - framework" into oc-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)

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

Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)
		1	2
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history