tree 0a49014d1432622626faf75e0e49afcbbb7d3501
parent ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4
parent 7da1ad699989db8417ce54eb26697eae4a30f634
author Daniel Sandler <dsandler@android.com> 1343253935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343253935 -0700

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

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