tree 9e0ad5aeb0e7aab1ff4f4eb18cb8f6c4833340b3
parent 71930dd77e4dc6f6be5c648019d2ab0da5f0584c
parent c524ca275add1c84ef4e1e5c105058f44cac5efb
author Daniel Sandler <dsandler@android.com> 1343241292 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343241292 -0700

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

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