diff options
| author | Tom Taylor <tomtaylor@google.com> | 2010-07-21 11:22:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-21 11:22:22 -0700 |
| commit | 92010ff5cf014c0ff73ee4ad4bb169dd916a15a9 (patch) | |
| tree | 1bd45831c197d44c3c1c719efa4969c029d0a318 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8138e841a5adb3c5629e263f5a8cb2e936d234ce (diff) | |
| parent | dbac180d8342a7db2bb9994f937869eecb6b50ff (diff) | |
am dbac180d: Fix a merge problem with html mms
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread
* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
Fix a merge problem with html mms
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions