diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-28 18:58:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 18:58:23 -0700 |
| commit | 1498c97163068a930a2642699eada598971ad5ba (patch) | |
| tree | 6fb205a733931a18b7a55cc3ef341c19b33e7496 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a0e0b568cb8789d5418e50e75b93c3f62093c9cb (diff) | |
| parent | 81877d0fdad84fae9d40bd027b1d9742d6a1b9ff (diff) | |
am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385':
CherryPick 988eeeb5 from hc-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions