diff options
| author | James Dong <jdong@google.com> | 2011-11-15 20:19:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-15 20:19:55 -0800 |
| commit | 0e7d85fa93a5f5975b437277439b3c65f86cf275 (patch) | |
| tree | 9583c9f67deea73d392e692331da2650a381dd38 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ca127baa0675bc1168019fbb1f9812dbbe4613d7 (diff) | |
| parent | 4e72e2bfc24afe053ca98c6de2591a4057cfd9fa (diff) | |
am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
Document that release() should be called with onPause() and onStop() for media objects
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions