diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-10 10:31:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 10:31:52 -0700 |
| commit | c20d4c1589558c052b295d7605d3a6bab04ea84d (patch) | |
| tree | a391a16652e856ed088baf870d69ccd2630df64f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6bea5574fbd134a4f6e535eb35efabbe5f6735dd (diff) | |
| parent | 01aa602b60401401db0b6c854efb2e31dd3f2a96 (diff) | |
am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '48305f327ff3839ddbfa5a6fb42a57150a69480c':
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions