diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-25 12:24:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 12:24:02 -0700 |
| commit | e34a3d1a294e1d83caa410f3006e474bef787e1a (patch) | |
| tree | 05444e8af43aebc3622febb154cfe602619c6c06 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 043f03f0ec01e855e9ae0befa320a9834e793c84 (diff) | |
| parent | 2091772e7ce8ce5b7ff1ddb9921e60cbaa6bd5f0 (diff) | |
am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '468204124e95bbf74ae8cc000318ade29e311be6'
* commit '468204124e95bbf74ae8cc000318ade29e311be6':
don't try to lock a buffer that wasn't allocated with SW usage bits
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions