Revert "second fix"

This reverts commit 1b3dd6bc9f60dd463e58b19abb4cb0ef7ec46112.
Revert "Fix compiling Settings ElectronBeam"

This reverts commit 10672ed3dce344083eeaab19556be4eb976b9b42.
Revert "Settings: ElectronBeam H/V settings (2/2)"

This reverts commit 8a8afc1864fdc358bcbbede88d5ed57a76b488b7.

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

	modified:   res/values/cm_arrays.xml
	modified:   res/values/cm_strings.xml
	modified:   res/xml/display_settings.xml
	modified:   src/com/android/settings/DisplaySettings.java