diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-19 20:48:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-19 20:48:21 -0800 |
| commit | 711683cd96884690b9e834198e7c756bb23ab5ad (patch) | |
| tree | a47984684926cd6f7299a2a8f48ea5f3c604e156 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 192d784e9439a1ed10ee95ca005a760d8bac160f (diff) | |
| parent | 25a43adabb70aa769a097c6cb09d71b031431677 (diff) | |
am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
Dreams (now Screen Candy) development.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions