diff options
| author | James Dong <jdong@google.com> | 2010-04-13 12:20:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 12:20:38 -0700 |
| commit | 8d9ffd0b976c5054ce7e5f1bddf1b081bbcb7dce (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0a782553986b953d3984a10f1a067f14ced4affb (diff) | |
| parent | 263f52f58e32d691d0c8057ef7376ece085f50df (diff) | |
am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions