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 | 38c0f6968b4741baee9601bc5cf4ad6765ba7720 (patch) | |
| tree | a1ea7708d0e34e0d04004e5180381e192a0c2f64 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5a0837cb14ee0b8d4ba7e924001578aaff63148c (diff) | |
| parent | c05ee94e5fbab1837160b030c8cb4d1fccc5a8e2 (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