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

Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'

* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.