FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
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 'cm/cm-11.0' into HEAD

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

Change-Id: I55e767d445b82a599072e598c04af71482d3a89b