tree 2c7974fd1ea3290016cc98ce7d3950a503f2950e
parent 8e9d9c990cd6d270d50ba7fd7334fc8d8efe10f7
parent 9495435f2d4bb3cf7f6ea6682c68d0caf2140386
author Nick Kralevich <nnk@google.com> 1441405164 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441405164 +0000

am 9495435f: am 42b47013: am 93d5ea6b: am 739f204f: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01

* commit '9495435f2d4bb3cf7f6ea6682c68d0caf2140386':