tree 30718451701c90294b696f521384708e8113806a
parent b485c9958754bf132e84e3c5019b484951c351e1
parent aa671a8465ea3f113ac3efcae8214c32e04f79cd
author Michael Jurka <mikejurka@google.com> 1380915597 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380915597 -0700

am aa671a84: am 2fe1530c: Fix NPE

* commit 'aa671a8465ea3f113ac3efcae8214c32e04f79cd':
  Fix NPE