| commit | b3f23da320991dd078b6cc55c719201cd8d7eb1c | [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 | 40a4f25ef784baeab54ce1f59399a167891d0c2b | |
| parent | 7352c8bb4242caeba47e7696541c133760cc95de [diff] | |
| parent | e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0 [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