| commit | 69e96c93e121858335a28ef4edff5f4948227185 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu May 28 17:11:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:11:40 2015 +0000 |
| tree | 0470f4b79904b01d993b2d92c6db5bf0f75cc86d | |
| parent | e7464b58096d0b3ecae6f54c3487fd0980e18760 [diff] | |
| parent | 5198ac9e6a48bb89c8e2031fe92fc85fbfd67da8 [diff] |
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 '5198ac9e6a48bb89c8e2031fe92fc85fbfd67da8':