diff options
| author | Selim Gurun <sgurun@google.com> | 2012-01-11 14:20:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 14:20:32 -0800 |
| commit | e835c3a6fe15ecaa4e0077f54153430ffdd0247a (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a63db7800eb3f31297b97feb31aa1b272e4148f6 (diff) | |
| parent | d99d96e3dc9e2dd8addab88aa2fd6a401d7e899a (diff) | |
am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
Do Not Merge. Move ssl callbacks to webcore thread.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions