diff options
| author | Justin Ho <justinho@google.com> | 2010-10-25 16:50:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 16:50:34 -0700 |
| commit | d6a3b3885f7e623ba04ac49e6a4197d47cf98fcf (patch) | |
| tree | 4ca64e6705104fcfb33576e9aa815f1a29a55c17 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8fcb0044238afb08598ac30ce299758f906de9f0 (diff) | |
| parent | a988e8dd608ab6d374f5afc86358f28e9c241d97 (diff) | |
am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions