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