tree f43df973e004001285d0778c6139842aa841d942
parent 5016b98520b9dbad8cf234a15fded9fb9e805ea2
parent a35a7807c27641187e6de5dee8dcd405b683e294
author Michael Jurka <mikejurka@google.com> 1339530203 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530203 -0700

am a35a7807: Merge "Fix NPE" into jb-dev

* commit 'a35a7807c27641187e6de5dee8dcd405b683e294':
  Fix NPE