diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-24 02:57:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 02:57:31 -0700 |
| commit | 15498dbaa1005b24b10463c2e3faff040baf9fcc (patch) | |
| tree | 228f1924ff66bb350c9ca06f4346110b5edaf9f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 48a1df119257447801c558e6c258beadbe0c7619 (diff) | |
| parent | a81e01a111d7556d820672649051ad89ce7a6da5 (diff) | |
am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
* commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8':
Merge 05b7b69c from honeycomb-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions