diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-19 15:29:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 15:29:24 -0700 |
| commit | 95f0543655773cb1bde6f7b62e7edcd5abe1dd44 (patch) | |
| tree | 849c2bad6cc17de4aabbf3d7c77473978f489cc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c22a9b7d8eb2e4b2162b0705376303ce9317ae64 (diff) | |
| parent | 986fef582b7798b6bca7d7d8716d098e04f3f139 (diff) | |
am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp
* commit '189de2820932fd5dc98b9639fdc420a57cfa2316':
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