diff options
| author | Justin Ho <justinho@google.com> | 2011-03-14 18:31:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:31:06 -0700 |
| commit | 9f31bd73f846b69f134a6753d5c8154648b324ed (patch) | |
| tree | 96ad61bb8195c565aca28af546b33c8499bec00a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8a97bb527ffc382a161cf24b52e86b8b828be880 (diff) | |
| parent | beb4a201a59c20bc24cae5538609fbccace38f32 (diff) | |
am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
Fixing naming for disabled paste assets Updated paste assets
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions