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
update drawables

Change-Id: Iba041b08bd13ed275e143b1fe7b140575d647940
Merge branch 'cm-11.0' into martincz