tree 28f2de38f1e07e524b28c14cea55c8fb4c56da97
parent f4f6e8dd560e08685537d7a55333bcc6fae8e9fe
parent 380929d02b329cafe8330903a01b862aafdd044d
author Paul Westbrook <pwestbro@google.com> 1363675948 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363675948 +0000

am 380929d0: Prevent NPE

* commit '380929d02b329cafe8330903a01b862aafdd044d':
  Prevent NPE