tree f04e4ae6c669acc088fdce77448b8d647caef8e2
parent e5fc06e9035a0e50991cb4382e1c02eeec6f7ee9
parent 4d2d55a9f4f27beae7db9910bc63dd04ead20ee3
author Nick Kralevich <nnk@google.com> 1410414378 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410414378 +0000

am 4d2d55a9: am eee33edd: am acccf62d: am 08404718: am 843c1f42: Don\'t NPE when no security message is provided.

* commit '4d2d55a9f4f27beae7db9910bc63dd04ead20ee3':
  Don't NPE when no security message is provided.