diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-02-03 10:36:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-03 10:36:02 -0800 |
| commit | 5e200251c138cfc4ea0e9be43b1d75f9b0090f14 (patch) | |
| tree | 0b8accc2d5b58e5121e60ec38a0a2b829f266455 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2236131dc6001e281b3cbe530593e7c89d6ec07c (diff) | |
| parent | 60c921294ac4e14d841dee4079dc482c0a521082 (diff) | |
am 2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '2243cca40c5f74cf89fe9bccce6e35af1acedb0c':
Time to take down the Christmas lights.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions