diff options
| author | Ben Murdoch <benm@google.com> | 2010-04-01 08:47:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 08:47:58 -0700 |
| commit | 09c5ec77964d8e9e477f497a030609d33249e11d (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 798304e752893d3e6502a81dcd032b4e9ea74b78 (diff) | |
| parent | 9859ba197a026198e146cb5dbff2ee0e12ef628b (diff) | |
am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken
* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
Cherry pick from master.
Cherry pick from master.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions