Custom lockscreen wallpaper [2/2]
Based on commit of ParanoidAndroid on android 4.3

Conflicts:

	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java

Change-Id: I375db4c2a1619da765c4be829812557792905a22

Fix: custom lockscreen handle to small

Conflicts:

	src/com/carbon/fibers/fragments/ls/LockscreenStyle.java

Change-Id: I928ab7q9e1329sl521i6wo739020482907190y99

Lockscreen wallpaper: show error if cropping not supported

Conflicts:

	src/com/android/settings/AOSPAL/AdditionalSettings.java

Change-Id: If32700ce9ba3f8d4ff37d7d842529f672ed7d84f

Custom lockscreen handle: scale image up if needed

Change-Id: I6ae2e93fd890e6459d2de17c59039590a9ac0f9a

Custom wallpaper: use PNG

Change-Id: I5bb42fdcb18ae263c0b6ca966260e44613867b70
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into cm-11.0

Conflicts:
	src/com/android/settings/SecuritySettings.java

Change-Id: I6bb0a3471f436495dd11b447c750cf7b20eefa8c