Merge "Print settings polish" into klp-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)

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

Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/Settings.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history