tree c7e5a4a1ff66f2fbd14ebc2722bab5ecc028fb4c
parent 7318f72ffa1c461850fb08be90f867f0c8c92968
parent 05565f5f01d062672dc27ffce5a2f85227c4bfaf
author Michael Jurka <mikejurka@google.com> 1350663195 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663195 -0700

am 05565f5f: am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '05565f5f01d062672dc27ffce5a2f85227c4bfaf':
  Fix NPE