Merge "Implemented advanced printer selection and API refactoring." into klp-dev

author Svetoslav <svetoslavganov@google.com>

Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)

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

Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)
author Svetoslav <svetoslavganov@google.com>
Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
author	Svetoslav <svetoslavganov@google.com>
	Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 20 Aug 2013 20:42:05 +0000 (20:42 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history