diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-26 12:25:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-26 12:25:37 -0700 |
| commit | 2dce5547f7eb678144a1e411f0c8aca3d1044d3c (patch) | |
| tree | 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8c335a50b8504903503f56e92f7f5d4370b52176 (diff) | |
| parent | 23abef82b6986405dbd3e6522f8713d29d51d1e2 (diff) | |
am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp
* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
Fixed bug in vlm effect bunde wrapper effect init function.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions