diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-03-31 08:35:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 08:35:16 -0700 |
| commit | 178ff3da72107086a3ce2494c924b99d2d048454 (patch) | |
| tree | 3552620b2a0ba895bf41b4587f5199ab7df863b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 906bcf217683d996b75d8360da9a10756a5c0b48 (diff) | |
| parent | 8aaf5a511337bdb4e26663a8e520279ee7cb23cc (diff) | |
am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp
* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
Fix HttpProxy.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions