diff options
| author | James Dong <jdong@google.com> | 2010-04-13 12:15:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 12:15:26 -0700 |
| commit | 263f52f58e32d691d0c8057ef7376ece085f50df (patch) | |
| tree | 3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6e5467d2b47435ff9538ac676165267ce5abafc0 (diff) | |
| parent | ce95b940827b1efa96aef6d4d9fbeece97bbab1e (diff) | |
am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
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