Merge "Remove warning message when enabling a serive and enable new services"

author Philip P. Moltmann <moltmann@google.com>

Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)
author Philip P. Moltmann <moltmann@google.com>
Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/print/PrintSettingsFragment.java
Simple merge
author	Philip P. Moltmann <moltmann@google.com>
	Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 9 Nov 2015 18:38:22 +0000 (18:38 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/print/PrintSettingsFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history