diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-10-27 11:23:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-27 11:23:58 -0700 |
| commit | 8d3420f18f2e9355b515af1b578239c70ea430fb (patch) | |
| tree | a36d2a11b1cd19011556437a6a7ab439626825ee /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dd5163d2410075b3494f80b63133da2845cdc270 (diff) | |
| parent | 069ba0b5f24d5e42b6cde863baf0304c08b21f06 (diff) | |
am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions