diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 20:10:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 20:10:30 -0700 |
| commit | a8a0ad913c4af7d3d450255df2c9aa10e358328c (patch) | |
| tree | de30c854a07ca8eb3eb435e8437fb70e2c3d5dc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a380e023b5ad5e1b538187690cc98fc2997a885b (diff) | |
| parent | 8c33c556819df9ecc112f26bf9fa5794aca6e32c (diff) | |
am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'
* commit '09f672509b78344258f1b0d9f021d2ec99942515':
Fix compilation errors in libmedia, libstagefright.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions