diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-28 13:00:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 13:00:32 -0700 |
| commit | 2121f3cd04b18041e004e2003488703ef9245afe (patch) | |
| tree | e3fe56f3a9a380af64cd06de2c2cab32a08165a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db58f561b56ef8a8220ca0d100fb1fc7036300a9 (diff) | |
| parent | 3ff47bdcf94b9989c512ef7492b3596cbe17c0bd (diff) | |
am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp
* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
New assets. DO NOT MERGE>
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions