diff options
| author | Andreas Huber <andih@google.com> | 2010-10-18 08:05:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 08:05:09 -0700 |
| commit | 4779f91c234ddc1903a647e9008a74a7c48babe3 (patch) | |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b265422681316e89052d2fa47f5b448739961bcc (diff) | |
| parent | 28a0c199bc279d1fd377a5b738f18a2199ff095c (diff) | |
am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'
* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
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