tree 267838fb32132eb4b1052124d3980dc77b655d8d
parent 7a311997046f48b0f0d1b6af9592b9dae6d1c2a2
parent 4a198dc08f7aad383f23399c1a99ccb09caa4489
author Amith Yamasani <yamasani@google.com> 1285198189 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285198189 -0700

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