diff options
| author | Chet Haase <chet@google.com> | 2010-09-15 21:53:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 21:53:07 -0700 |
| commit | 7bbf9bbb78869aa124a1b8a26f1d7c785a9f992c (patch) | |
| tree | ce9a4197ae4a4ae8a43c0e26d2b8d0a41c86bf3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 02a71f7ab423ac1be8c37296355bd0ab68c5376a (diff) | |
| parent | 28f96e9a8161d6e85f401fd4697c742dca8d4596 (diff) | |
am 7ddff990: (-s ours) am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf'
* commit '7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf':
Adding new assets for designers
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions