diff options
| author | Scott Main <smain@google.com> | 2010-07-28 14:23:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 14:23:16 -0700 |
| commit | 7d3bc349d9b4edf0151d36d44669374422a797f2 (patch) | |
| tree | 9400676d30a247ae547e1c0ce2028ec9e9b94307 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e57e8950804b08c80fb69df184b2f5af84ae103c (diff) | |
| parent | 9c990d4d8aa736d86427b48fb00cbe9ed9b0b4d4 (diff) | |
am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread
* commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
fix markup error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions