diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 09:27:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 09:27:42 -0700 |
| commit | d2ca897f68e21b3381c933c728078fb62c517eed (patch) | |
| tree | e061735652213476dbecfa391275ab3eb2b48c41 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0adacd771afe8634290562e5f8a9232fa3345778 (diff) | |
| parent | 74acdc699babf490427324271efd78da3bbd44e1 (diff) | |
am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp
* commit '7747795af508354b3792e497e6a7b4bc749b4007':
These are not javadoc tags, they are annotations in sample code. Escape them properly.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions