diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-21 16:28:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 16:28:04 -0700 |
| commit | 93f60444b1c4598d61af06a832fa6f2233cdf94b (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ffa55568aeb95fe63cbbe888fdf3f12abe6141a (diff) | |
| parent | 8960381aa95d49500da81a580ef140c2bbca3713 (diff) | |
am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
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