diff options
| author | Mike Dodd <mdodd@google.com> | 2010-08-12 16:50:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 16:50:39 -0700 |
| commit | 4a7c9e05fdb43b968d5dc38ca5d5f90d9bc258b0 (patch) | |
| tree | efcecb33ab8b7e99aa5f484191393f9f1578a0f8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 24603429620d34d4d8c7deeedaa959325463d6cd (diff) | |
| parent | 3cae496ccb2620bfdf7e8e717dd81152acb7929f (diff) | |
am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'
* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
Support getting codec, width, and height in URL for gtalk playback.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions