| commit | 6bd6d21962d443396747931ae842aece3dbef90f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Sep 15 11:37:22 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 15 11:37:22 2010 -0700 |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f | |
| parent | 7ea18cf23edd89c42ec67d7659cea4470b4285fe [diff] | |
| parent | fe9f855c4ef2c73632944f71481d8f27586b261f [diff] |
am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0' * commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0': Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters