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