FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
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 "FindBugs: Call to equals() comparing different types" into cm-11.0
Settings: Add AOSP dummy strings

Add some empty strings to remove aapt warnings caused by
aosp strings without default translation.

Change-Id: I96f36e9768977d70bcc8ce717eb677c50ef4982d
Revert "Revert "settings: Add xxhdpi profile icon""

This reverts commit a97c4b862d5331df2252df50df9931a8574650c0.

Change-Id: I23473bf86dec09bf4d4a26287f911f25f5c21668
Merge "Revert "Revert "settings: Add xxhdpi profile icon""" into cm-11.0
New setting under "Debug settings" that enables the development shortcut

Resolve Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
settings: Fix build

Change-Id: Ia6a4bed9e8184f031ef1ef5be90516ca0714ee4f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "settings: Fix build"

This reverts commit 048637c00b814e534681293215cd2101b308f8c0.

Change-Id: I98ffeaff6573bfcfc5eb69b1ea49a50eb0a22013
Fix the build

This shouldn't be there in the first place
It's a result of a failed rebase

Change-Id: I48610dfc4214a096b1c4af61af59bf52c5e50529
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ie11223956b460c96dfcbe42ac51180d8f48fd364