Framework: Quick Settings Pulldown thanks CM

Change-Id: I322ec2726ec3e6741ea68dee77b56b73c247d11c

Conflicts:
	core/java/android/provider/Settings.java