diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 13:42:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:42:46 -0700 |
| commit | 014b578c6d664b20c88046f7ea9da49af0d728e9 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0815caf66f810e59f4db3c968663cd87d28f3cbd (diff) | |
| parent | 949c04fd402ae348ea0fc20bdff0d6dfd907e2d4 (diff) | |
am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp
* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions