diff options
| author | Justin Ho <justinho@google.com> | 2010-10-26 09:13:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 09:13:08 -0700 |
| commit | c6e6e302d07871da750391deeaada9ee8c6b4156 (patch) | |
| tree | 26fe9fae6e12408475d419abeff5b9cef03ec8d5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f6a75550ebfcddf699401c7c9256a76bb9bfccfd (diff) | |
| parent | 8b46c7fea21a0bd9ac8c0de111524d27a2a550f8 (diff) | |
am cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions