diff options
author | Bart Sears <bsears@google.com> | 2011-10-14 16:09:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-14 16:09:46 -0700 |
commit | 2b9a32890502243e6c688e68a7526fd3a81f2a07 (patch) | |
tree | 4424eb889fa478548a17d56b2f1baa0355be4c75 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | f02e72a5b243141e55f7d09eed7c64f520c1a551 (diff) | |
parent | 8168da86127f27b977106db2f67d3c605346f0d9 (diff) |
Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions