commit | bb88de22be73b119f65db692ad64c9f4f055eb36 | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Tue Nov 11 10:28:39 2014 -0800 |
committer | Shawn Pearce <sop@google.com> | Tue Nov 11 10:28:39 2014 -0800 |
tree | 511ca683bf321103c28a5a84b1e4f8e0d9626e61 | |
parent | 4ea945eb5ec04f403390f491aab929aba5e79a85 [diff] | |
parent | 8071a4f0148578db38edb2459ea7af4b33a6b6ad [diff] |
Merge branch 'stable-2.10' * stable-2.10: 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: I7853def28109357e8629f1384f90d4630da00483