diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-18 17:04:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 17:04:47 -0700 |
| commit | 8043106caf55a12649ffc4bcd2adb5973fbaa10b (patch) | |
| tree | ccc2e69bb92259cb595ebc0359809599dcc39cbe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5a989fc34354b9f62715ee05199a79852f2a4828 (diff) | |
| parent | 95ea513755af642bb11cbc6bae2d1965d2f00195 (diff) | |
am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp
* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
Don't force ended when full screen video is returned manually.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions