diff options
| author | Chet Haase <chet@google.com> | 2010-09-17 15:55:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 15:55:11 -0700 |
| commit | 79bc8e6be2e95eedfbfd91119a19a8ae445a9bc0 (patch) | |
| tree | f91f2f416619186cd4c1c3e465af0a202fe47107 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e8ea8ccdb4d3905c6387d2e59317608d45e0fb3a (diff) | |
| parent | 400a478227242fa7525dbb73eb0aa33b1d1122ad (diff) | |
am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686'
* commit '6dcffb434fff42b956b604e24a5b5728e721b686':
new assets
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions