tree f5cfcd74ac14c6b14abadca10e1ac619455a9578
parent 8d33d39d68d46af758143a56c89322360cbbada2
parent 0af489568de297fafc1d0e577481181ce3d81d4c
author Daniel Sandler <dsandler@android.com> 1334152980 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334152980 -0700

Merge "Fix PowerMgr NPE on emulator."