am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen...
am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread
Merge commit 'a8d477f0' into gingerbread-plus-aosp
* commit 'a8d477f0':
Pressing the power button quickly needs to turn the screen on and off correctly.