diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:24:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:56 -0700 |
| commit | 28a0c199bc279d1fd377a5b738f18a2199ff095c (patch) | |
| tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1b80474c2c7d48e3781a84003ca77b84c3e4be17 (diff) | |
| parent | 4b9f330f2510899a4e52f7c3b3771aa110a3c9db (diff) | |
am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp
* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions