rebase off master...again

wonders....

 Changes to be committed:
	modified:   README.md
	modified:   core/java/android/view/WindowManagerPolicy.java
	deleted:    core/res/res/drawable-hdpi/ic_lock_reboot.png
	deleted:    core/res/res/drawable-mdpi/ic_lock_reboot.png
	deleted:    core/res/res/drawable-xhdpi/ic_lock_reboot.png
	modified:   core/res/res/values/arrays.xml
	modified:   core/res/res/values/strings.xml
	modified:   core/res/res/values/symbols.xml
	deleted:    fmradio/include/android_fmradio.h
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmBand.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmBand.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmReceiver.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmReceiverImpl.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmReceiverService.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmTransmitter.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmTransmitterImpl.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/FmTransmitterService.java
	deleted:    fmradio/java/com/stericsson/hardware/fm/IFmReceiver.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IFmTransmitter.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnAutomaticSwitchListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnBlockScanListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnErrorListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnExtraCommandListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnForcedPauseListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnForcedResetListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnRDSDataFoundListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnScanListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnSignalStrengthListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnStartedListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnStateChangedListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/IOnStereoListener.aidl
	deleted:    fmradio/java/com/stericsson/hardware/fm/package.html
	deleted:    fmradio/jni/Android.mk
	deleted:    fmradio/jni/android_fmradio.cpp
	deleted:    fmradio/jni/android_fmradio_Receiver.cpp
	deleted:    fmradio/jni/android_fmradio_Transmitter.cpp
	modified:   policy/src/com/android/internal/policy/impl/GlobalActions.java
	modified:   services/java/com/android/server/power/ShutdownThread.java
	modified:   services/java/com/android/server/wm/WindowManagerService.java