tree b384ee75405465b41a55c0fb82ddf0b3f16b7dd1
parent 35980c6c7458edeff02a76e464e19f65c7237ef1
parent 44db6e1fa47ea438b7a482812aac91126fe331fb
author Amith Yamasani <yamasani@google.com> 1285198511 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285198511 -0700

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.