diff options
| author | James Dong <jdong@google.com> | 2010-09-23 10:24:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 10:24:37 -0700 |
| commit | 0608b3a215c6fba9435ad014ff19cce851232492 (patch) | |
| tree | 653b565a6456c6bc28c77296b7401614aaf2fc2e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6215bf1a2c8515f7d083dcff7e78be6e62b54c5d (diff) | |
| parent | 535b68553e077be8e142f3a6cefc79cfcfd974cd (diff) | |
am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'
* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
Use the advertised profile and level from M4V and H263 video encoders
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions