diff options
| author | Selim Gurun <sgurun@google.com> | 2012-01-11 16:04:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 16:04:55 -0800 |
| commit | 6eaf101cf4cd11a869ccd828375104bb53112029 (patch) | |
| tree | 12823493d1b9718500ad69feb1d6670900863b88 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 19f2cfe3ad5e3ba53a1af386ab004cbd5412dc87 (diff) | |
| parent | e835c3a6fe15ecaa4e0077f54153430ffdd0247a (diff) | |
am 0265a4a0: (-s ours) am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '0265a4a0e02db98b85bd7f9be8b866d3fb9889d2':
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