tree 83e9e6f97177d8c0a079f6101c0a3e118fa16ecc
parent b3f27f30fcdd7b5c3e03d705bd567d64f671a374
parent 7beccc08e3a90afd0732a187ba48ea5daaa5f9bb
author Michael Jurka <mikejurka@google.com> 1348473125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348473125 -0700

am 7beccc08: am fa7969fb: Fix NPE

* commit '7beccc08e3a90afd0732a187ba48ea5daaa5f9bb':
  Fix NPE