| commit | 25d82404f5f63963645660fc206ee463039fad8d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu May 28 18:02:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 18:02:47 2015 +0000 |
| tree | cd95ced967fb21da68211d72de42d3a9cf325bf7 | |
| parent | c2d69581dec29ca14282c65a7c5ad85f8a38ef52 [diff] | |
| parent | 64999eb9312e3ec6d3be201f0b415edfa54aad47 [diff] |
am 64999eb9: 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 '64999eb9312e3ec6d3be201f0b415edfa54aad47':