| commit | 64999eb9312e3ec6d3be201f0b415edfa54aad47 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu May 28 17:46:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:46:07 2015 +0000 |
| tree | 5187e83aa07c720b9a15637f36d1a18ef13fe39b | |
| parent | 5e195d2ee00c69edba44c33535dad1c2c8da0646 [diff] | |
| parent | 69e96c93e121858335a28ef4edff5f4948227185 [diff] |
am 69e96c93: am 5198ac9e: am 8337761d: am 0b2c379b: am dbffa7db: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 automerge: 07a0d2c * commit '69e96c93e121858335a28ef4edff5f4948227185':