diff options
| author | Gloria Wang <gwang@google.com> | 2011-09-15 17:38:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-15 17:38:36 -0700 |
| commit | 5e74fb2649df099ab35c1640aeaa39033a8ceb32 (patch) | |
| tree | 837e1d8c00cbf4815a91c20a2a1236554f648cc6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c2d413c753e2f87184dd3cbe33335699eb67c991 (diff) | |
| parent | d8793af9f23f82cab804442be3f536e4a48912bf (diff) | |
am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom
* commit '62c24d7bfa5a88655ba9981dba2a565c1136a255':
Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions