diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 11:56:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:56:27 -0700 |
| commit | ef0cddc85eaffc21589a7b6d7376c5331a2cd2b8 (patch) | |
| tree | 488db13a095c1b8af7bc6468dc98376c1bcdf75c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a8e30825b711d33221084a910781c92fd959e3a5 (diff) | |
| parent | 02e3c9e69e81c4dad29d64fb9f785592563ee8ce (diff) | |
am 390490e4: (-s ours) am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread
Merge commit '390490e4ae768d541018038c782c52b471bb61de'
* commit '390490e4ae768d541018038c782c52b471bb61de':
DO NOT MERGE - Doclava warnings are now errors.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions