am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings...
am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b5' into gingerbread-plus-aosp
* commit '95f600b5':
Fix NPE in PowerManagerService on boot, if some settings are corrupted.