diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2011-03-05 09:19:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-05 09:19:37 -0800 |
| commit | 3cf6b65abd505d0bcc77607001250767259094fa (patch) | |
| tree | a14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 775630928a9ac07dc82cb8764839ea5f77f08c6b (diff) | |
| parent | 99ee72c3baaceafe772fe712eb6045ca0c32d618 (diff) | |
am ba76f2ac: (-s ours) am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
* commit 'ba76f2ac2a2edf9b3a2c67ab57f9514289473549':
Make setupDataCall take a protocol parameter.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions