diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-14 11:29:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 11:29:57 -0700 |
| commit | e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0 (patch) | |
| tree | 7894947a9f43f4c8d11c95bdffef7610c5d336df /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0535d8577fb2a3687428f462c591ae3220e1f773 (diff) | |
| parent | 405d4db50b3db1fc5e015475218e190d193332d4 (diff) | |
am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp
* commit '405d4db50b3db1fc5e015475218e190d193332d4':
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