diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-15 11:37:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:37:22 -0700 |
| commit | b3f23da320991dd078b6cc55c719201cd8d7eb1c (patch) | |
| tree | 40a4f25ef784baeab54ce1f59399a167891d0c2b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| 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
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions