diff options
| author | Andreas Huber <andih@google.com> | 2011-05-17 10:37:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-17 10:37:25 -0700 |
| commit | 550f667feb7450fedd3b0bd8af34ed4948ff5c6e (patch) | |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79e058fcd4e52c63746b915fb96bb715a6eeaa9b (diff) | |
| parent | fbc17e128ac6f3e312965d3c860d09e8ef4ef6cf (diff) | |
am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions