diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-19 20:44:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-19 20:44:40 -0800 |
| commit | c05ee94e5fbab1837160b030c8cb4d1fccc5a8e2 (patch) | |
| tree | 6df7ff7d76e3906f6b1a7a2a66f645bdf7faf9f0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cd7f56fdd2b07d76c5845c0c2d3f8ce4ac3ed4f0 (diff) | |
| parent | faed2acf61cf05ae7829d55cb346d71bed37a6a1 (diff) | |
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions