diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-21 14:19:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 14:19:29 -0700 |
| commit | 8960381aa95d49500da81a580ef140c2bbca3713 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a50dad82b55393bba02c1adf721d651d822ba9da (diff) | |
| parent | 0953e899344dab69ad5232f33383fdf869a224a3 (diff) | |
am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
Support loading image and paused image for inline video
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions