diff options
author | Bart Sears <bsears@google.com> | 2012-01-06 15:47:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 15:47:04 -0800 |
commit | fd76796d296ff663c618832cf9920f4d766361bb (patch) | |
tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 5d98eb7e1b6332ef9cd7ca31a25a8f853af0193b (diff) | |
parent | 4dc1cbe06ffd3f01d9b8e5db141398d33ea47500 (diff) |
am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
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