| commit | 7ea18cf23edd89c42ec67d7659cea4470b4285fe | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Sep 15 11:36:58 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 15 11:36:58 2010 -0700 |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f | |
| parent | 5f58195ad8d7e5786e54656792c751d43e047fe2 [diff] | |
| parent | 4128f7c02bf41037aa6affd508670c045bd0bffa [diff] |
am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773' * commit '0535d8577fb2a3687428f462c591ae3220e1f773': Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments