diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-03-31 08:37:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 08:37:45 -0700 |
| commit | e45f2c544553e9315390221cb41a666ed11b8de2 (patch) | |
| tree | 8652850ea1b71670da1d7dd4420a16676827c007 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 174b935bdcde5dcffc71488756863980f1758dd5 (diff) | |
| parent | 178ff3da72107086a3ce2494c924b99d2d048454 (diff) | |
am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken
* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
Fix HttpProxy.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions