commit | 5198ac9e6a48bb89c8e2031fe92fc85fbfd67da8 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Thu May 28 16:56:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 16:56:51 2015 +0000 |
tree | 0470f4b79904b01d993b2d92c6db5bf0f75cc86d | |
parent | c5fda9411b335eda6511892bafe13bc34342a878 [diff] | |
parent | 8337761d0b19b219540054ce8e2b47fcfb2dbb78 [diff] |
am 8337761d: am 0b2c379b: am dbffa7db: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 automerge: 07a0d2c * commit '8337761d0b19b219540054ce8e2b47fcfb2dbb78':