diff options
| author | Chet Haase <chet@google.com> | 2010-09-17 13:14:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 13:14:58 -0700 |
| commit | 400a478227242fa7525dbb73eb0aa33b1d1122ad (patch) | |
| tree | 7400539746038f7c4f8603c749065ef72400b4be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ec118a47601c455bf2403fe762791d69ecddc077 (diff) | |
| parent | 14811c08dfbfc1a3e095e9f5977286f7fc27e0b5 (diff) | |
am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp
* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
new assets
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions