diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-21 17:48:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 17:48:59 -0700 |
| commit | 559e62fe740866ddd5903c6f261bd49927022453 (patch) | |
| tree | e5b894e47bdae3c99ce121f79bdc5c9f0c3c6b0d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 99551bdca9bf9f2e89b854c73a0e4acd89abae6c (diff) | |
| parent | 93f60444b1c4598d61af06a832fa6f2233cdf94b (diff) | |
am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '67440893ee32f057d2695b0eea9811e289b68603':
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