tree 762e2f63f59cca2dc9ac614348d2eed24d90fc0b
parent 440f32bbd48272095a5482abc87b8769ebd515b6
parent 08b7e78597b06b3801d909c9e9ca1538ed9fc355
author Daniel Sandler <dsandler@android.com> 1343279624 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343279624 -0700

am 08b7e785: am 7da1ad69: am c524ca27: Merge "Fix NPE on some phones at startup." into jb-dev

* commit '08b7e78597b06b3801d909c9e9ca1538ed9fc355':
  Fix NPE on some phones at startup.