tree e54a462c1f60ed820bac3672d19f873b03e142b1
parent 34716a89e247aff6853122472a09762eed4a2fc6
parent b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b
author Michael Jurka <mikejurka@google.com> 1365714780 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365714780 -0700

am b68e03a8: Fix NPE

* commit 'b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b':
  Fix NPE