diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 10:56:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 10:56:30 -0700 |
| commit | 25ded276e81b52dd5e355102a28ad56f3d84978f (patch) | |
| tree | ce9a4197ae4a4ae8a43c0e26d2b8d0a41c86bf3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | df966975c39b6fb114c9d1584b4cd2ddd1557a62 (diff) | |
| parent | 872ad4ae18f24670cc42986e17753eef9d9d2933 (diff) | |
am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'
* commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions