diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 11:35:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:35:39 -0700 |
| commit | 94c6e7e13577c7fc3e342fe70e0b569c4a153ac2 (patch) | |
| tree | 488db13a095c1b8af7bc6468dc98376c1bcdf75c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f9a38d1774de5be650eba31d8b95a59fe9846b5f (diff) | |
| parent | faedd14a3aafac44286290d2a49a10eb21ab3872 (diff) | |
am a85c4f16: am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'
* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
This was marked @Deprecated in the docs, but it was misspelled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions