tree e54a462c1f60ed820bac3672d19f873b03e142b1
parent de272d2a9ddf150384a3ddf66dba93e38d2c88de
parent 962a40fafb2b5d7fc66c46bdcb1e8d587d355c30
author Michael Jurka <mikejurka@google.com> 1365717507 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365717507 -0700

am 962a40fa: am b68e03a8: Fix NPE

* commit '962a40fafb2b5d7fc66c46bdcb1e8d587d355c30':
  Fix NPE