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

Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
tree: b384ee75405465b41a55c0fb82ddf0b3f16b7dd1
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE