diff options
| author | Mike Dodd <mdodd@google.com> | 2010-08-12 16:47:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 16:47:52 -0700 |
| commit | 3cae496ccb2620bfdf7e8e717dd81152acb7929f (patch) | |
| tree | 606bc32c0196a0c9036aac5d1d5e71fc4f9db0ac /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 06e7165194fa9f55994ce58069874ef77d32bc23 (diff) | |
| parent | d98ac85c79698af337af6900b4609fabd4f34371 (diff) | |
am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp
* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
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