diff options
| author | Bart Sears <bsears@google.com> | 2012-01-06 15:49:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 15:49:26 -0800 |
| commit | 79efd563cc2c5a3ac655d5e3ecdbc9735c8e6a6c (patch) | |
| tree | 6eec8d541334d19af13d46239d603d86f52eefd7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 087876ffa417fe076d89050b8cc90cd05d6dae58 (diff) | |
| parent | fd76796d296ff663c618832cf9920f4d766361bb (diff) | |
am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit 'c2eaee533fe25cd9a0781f349e9c8c7ef02bd648':
getDuration can be only called after prepared. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions