test rotation
Revert "Settings: Configurable 0, 90, 180 and 270 degree rotation (2/2)"

This reverts commit ec8969a1f669acafcdc610ec85e3713a06c66291.

Conflicts:
	proguard.flags
	res/values/candy_strings.xml
	res/xml/display_rotation.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Fix Wake on plug or unplugg
Merge commit '27c76bb' into c5

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