diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-14 11:17:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 11:17:22 -0700 |
| commit | 4128f7c02bf41037aa6affd508670c045bd0bffa (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5b86c15a4bd04fa60b7a1ca45066b500d0266e94 (diff) | |
| parent | e565df9d965b106281667df0b4f3f8896e1a855e (diff) | |
am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp
* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions