diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-18 14:22:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 14:22:08 -0700 |
| commit | d8260649e8094230dbefa7183e6ba03804c72ac9 (patch) | |
| tree | 683874f0ad6e73c7bdda40548e8fcdace725c2a1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ae24f94ce02e7179eda7b65ec73607fd87731d8 (diff) | |
| parent | 1e38fb24154be8350e7c1229c266f3f85af836b5 (diff) | |
am 03805f72: am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit '03805f729cacead5d0797c840430ea99b26036d6'
* commit '03805f729cacead5d0797c840430ea99b26036d6':
tracking merge of external/apache-http from dalvik-dev
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions