diff options
| author | Chet Haase <chet@google.com> | 2010-09-15 21:16:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 21:16:35 -0700 |
| commit | 28f96e9a8161d6e85f401fd4697c742dca8d4596 (patch) | |
| tree | e061735652213476dbecfa391275ab3eb2b48c41 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c491d8857e308a642d9e4656db05cb96b274f459 (diff) | |
| parent | 30aeb8c8547efbb1fb6c62f35df45842716a7c6d (diff) | |
am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions