diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-21 09:44:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:44:34 -0700 |
| commit | 5f7d6cf7bb67934f0ad03e792931ca5bf19b67c3 (patch) | |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cab7f41306da24a91f5acab3c92a4f9278983ccf (diff) | |
| parent | 95f0543655773cb1bde6f7b62e7edcd5abe1dd44 (diff) | |
am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1'
* commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1':
Fix for a Resource system bug that displayed the wrong name for missing asset.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions