diff options
| author | Fred Quintana <fredq@google.com> | 2010-04-02 11:00:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 11:00:30 -0700 |
| commit | 9618159766966f34b8e744eb95f569f7be3e0ba2 (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 220eec1971bd8cc08264cbe5e1a790674b5c40a8 (diff) | |
| parent | 5f8ce2b7bf8e0d76e2bc102fe337e5557b6f1481 (diff) | |
am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions