diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:25:14 -0700 |
| commit | 3fcc33a1f8d6f892f8ea1f46813ee7d5e7464a6e (patch) | |
| tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 28a0c199bc279d1fd377a5b738f18a2199ff095c (diff) | |
| parent | a28340d54528596d8211114935028da1496e5d81 (diff) | |
am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp
* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions