diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-21 11:37:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:37:15 -0700 |
| commit | 39d2c2cc3388ffd62bfce997aa2ad9f30a785e91 (patch) | |
| tree | 7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a409a6e227d85b2dbe9bf5f04b4dd401b5c5a682 (diff) | |
| parent | ab7fb91df50d77b9458a298dacca4b791c512c87 (diff) | |
am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp
* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
recovery just takes a filename as an argument now (do not merge)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions