diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-16 08:09:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-16 08:09:57 -0800 |
| commit | b04316c746ff3df93fdb9bdcd3f8f9d603f00ed8 (patch) | |
| tree | 76a85ebc08e2538fb6a27cea972455efcc38a856 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b28f824856a0b349d2a8866deecd8a89dd9fc287 (diff) | |
| parent | 7e97651fe39de4b3630f8d5bea146db3225cfccd (diff) | |
am 57ea96a4: Reconcile with ics-mr1-release
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
SurfaceMediaSource: use the HW_TEXTURE usage bit
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions