commit | 8071a4f0148578db38edb2459ea7af4b33a6b6ad | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Tue Nov 11 10:23:32 2014 -0800 |
committer | Shawn Pearce <sop@google.com> | Tue Nov 11 10:23:32 2014 -0800 |
tree | 14ada87d544c5e97491020a6189ab691253b2e7f | |
parent | e86e8271753b901a563b8d9249404e0459228450 [diff] | |
parent | 04ef5f717d589a5413647c133888d7a2c61759cd [diff] |
Merge branch 'stable-2.9' into stable-2.10 * stable-2.9: Inject InitStep members again before calling postRun. SSHD: Update to 0.13.0 Bump SSHD Mina version to 2.0.8 Bump Bouncycastle version to 1.51 Update EncryptedContactStore to not use deprecated/removed methods Change-Id: I4d67f79b9614289f222f9adcc8c513813ab3035c