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 | fe9f855c4ef2c73632944f71481d8f27586b261f (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4128f7c02bf41037aa6affd508670c045bd0bffa (diff) | |
| parent | e565df9d965b106281667df0b4f3f8896e1a855e (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions