diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-08-24 16:17:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 16:17:47 -0700 |
| commit | 397046641cd8f6da5c04ea161549d46e71cd923e (patch) | |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d334b0d12ff15ddc4da0df723db903f44663389c (diff) | |
| parent | 1543ffc4285f52e04daccca876c6581b7a1eeb45 (diff) | |
am 28060c8a: (-s ours) am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
Merge commit '28060c8a806b58fc53f281688146877e8c37a504'
* commit '28060c8a806b58fc53f281688146877e8c37a504':
Make VCardTestsBase public.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions