Merge "Print spooler security and some new print service facing APIs." into klp-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)

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

Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history