Added ColorPickerPreference.java
Fixed DisplaySettings.java
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2