am c0ad216c: Merge "Add a configuration option to turn on the screen when you...
am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c' into gingerbread-plus-aosp
* commit 'c0ad216c':
Add a configuration option to turn on the screen when you unplug the device.