Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b
settings: Add xxhdpi profile icon

Change-Id: Ib4b45821fc7b908a8fe5d44f31543c5e7e15ba5a
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "settings: Add xxhdpi profile icon"

This reverts commit 4f01995a95ec869da1da79f7d70a26b87581f7d8.

Change-Id: I94ac3ac8168d52eb2fedcdc34162ce1d0a735937
Merge "Settings: Add cLock settings back to lockscreen settings" into cm-11.0
Merge branch 'CyanogenMod/cm-11.0'