am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job...

author Svetoslav <svetoslavganov@google.com>

Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
author Svetoslav <svetoslavganov@google.com>
Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/print/PrintJobSettingsFragment.java
Simple merge
author	Svetoslav <svetoslavganov@google.com>
	Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/print/PrintJobSettingsFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history