Fixathon

Change-Id: I22cb5fd12804228429cc02c6cc196277f7dead89

Conflicts:
	src/com/android/settings/slim/DensityChanger.java
	src/com/android/settings/util/CMDProcessor.java